aboutsummaryrefslogtreecommitdiffstats
path: root/util/hmessages.po
diff options
context:
space:
mode:
Diffstat (limited to 'util/hmessages.po')
-rw-r--r--util/hmessages.po13788
1 files changed, 8015 insertions, 5773 deletions
diff --git a/util/hmessages.po b/util/hmessages.po
index 3dd3a22cc..43ce90835 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -1,14 +1,20 @@
-# hubzilla
-# Copyright (C) 2012-2016 hubzilla
-# This file is distributed under the same license as the hubzilla package.
+# red
+# Copyright (C) 2012-2016 red
+# This file is distributed under the same license as the red package.
# Mike Macgirvin, 2012
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2.5.3\n"
+<<<<<<< HEAD
+"Project-Id-Version: 5.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-20 12:03+0200\n"
+"POT-Creation-Date: 2017-04-07 00:05-0700\n"
+=======
+"Project-Id-Version: 2.3.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-05-01 15:36+0200\n"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
"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,162 +23,154 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../Zotlabs/Access/Permissions.php:53
-msgid "Can view my channel stream and posts"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:54 ../../include/permissions.php:42
-msgid "Can send me their channel stream and posts"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:55 ../../include/permissions.php:36
-msgid "Can view my default channel profile"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:56 ../../include/permissions.php:37
-msgid "Can view my connections"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:57 ../../include/permissions.php:38
-msgid "Can view my file storage and photos"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:58
-msgid "Can upload/modify my file storage and photos"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:59
-msgid "Can view my channel webpages"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:60
-msgid "Can view my wiki pages"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:61
-msgid "Can create/edit my channel webpages"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:62
-msgid "Can write to my wiki pages"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:63
-msgid "Can post on my channel (wall) page"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:64 ../../include/permissions.php:44
-msgid "Can comment on or like my posts"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:65 ../../include/permissions.php:45
-msgid "Can send me private mail messages"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:66
-msgid "Can like/dislike profiles and profile things"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:67
-msgid "Can forward to all my channel connections via @+ mentions in posts"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:68
-msgid "Can chat with me"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:69 ../../include/permissions.php:53
-msgid "Can source my public posts in derived channels"
-msgstr ""
-
-#: ../../Zotlabs/Access/Permissions.php:70
-msgid "Can administer my channel"
-msgstr ""
-
#: ../../Zotlabs/Access/PermissionRoles.php:248
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:946
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Social Networking"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:249
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:946
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Social - Mostly Public"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:250
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:946
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Social - Restricted"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:251
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:946
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Social - Private"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:254
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:947
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Community Forum"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:255
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:947
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Forum - Mostly Public"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:256
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:947
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Forum - Restricted"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:257
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:947
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Forum - Private"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:260
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:948
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Feed Republish"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:261
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:948
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Feed - Mostly Public"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:262
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:948
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Feed - Restricted"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:265
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:949
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Special Purpose"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:266
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:949
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Special - Celebrity/Soapbox"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:267
+<<<<<<< HEAD
+=======
#: ../../include/permissions.php:949
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Special - Group Repository"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:270
+#: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Profiles.php:798
#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Connedit.php:914
#: ../../Zotlabs/Module/Settings/Channel.php:463
+<<<<<<< HEAD
+#: ../../extend/addon/addon/cdav/cdav.php:277
+#: ../../extend/addon/addon/cdav/cdav.php:284
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1148
+#: ../../include/connections.php:675 ../../include/connections.php:682
+#: ../../include/selectors.php:49 ../../include/selectors.php:66
+#: ../../include/selectors.php:104 ../../include/selectors.php:140
+=======
#: ../../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:681
-#: ../../include/connections.php:688
+#: ../../include/permissions.php:950 ../../include/connections.php:675
+#: ../../include/connections.php:682
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Other"
msgstr ""
#: ../../Zotlabs/Access/PermissionRoles.php:271
+<<<<<<< HEAD
+msgid "Custom/Expert Mode"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:46
+msgid "Can view my channel stream and posts"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:47
+msgid "Can send me their channel stream and posts"
+=======
#: ../../include/permissions.php:950
msgid "Custom/Expert Mode"
msgstr ""
@@ -182,7 +180,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:959
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../include/channel.php:945
msgid "Requested profile is not available."
msgstr ""
@@ -197,7 +195,6 @@ msgstr ""
#: ../../Zotlabs/Module/New_channel.php:77
#: ../../Zotlabs/Module/New_channel.php:104
#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Setup.php:212
-#: ../../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
@@ -205,19 +202,18 @@ msgstr ""
#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29
#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:61
#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50
-#: ../../Zotlabs/Module/Wiki.php:233 ../../Zotlabs/Module/Wiki.php:339
+#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:315
#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:137
#: ../../Zotlabs/Module/Profile_photo.php:280
#: ../../Zotlabs/Module/Profile_photo.php:293
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:223
-#: ../../Zotlabs/Module/Item.php:240 ../../Zotlabs/Module/Item.php:250
-#: ../../Zotlabs/Module/Item.php:1071 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:126 ../../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: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/Editwebpage.php:68
#: ../../Zotlabs/Module/Editwebpage.php:89
#: ../../Zotlabs/Module/Editwebpage.php:107
@@ -226,7 +222,7 @@ msgstr ""
#: ../../Zotlabs/Module/Block.php:76 ../../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:146 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Mail.php:164 ../../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
@@ -247,40 +243,49 @@ msgstr ""
#: ../../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:3495
+#: ../../include/attach.php:1148 ../../include/items.php:3470
#: ../../include/photos.php:27
msgid "Permission denied."
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
-#: ../../Zotlabs/Module/Editblock.php:113
-msgid "Block Name"
+#: ../../Zotlabs/Access/Permissions.php:48
+msgid "Can view my default channel profile"
msgstr ""
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2280
+<<<<<<< HEAD
+#: ../../Zotlabs/Access/Permissions.php:49
+msgid "Can view my connections"
+=======
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2267
msgid "Blocks"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Blocks.php:156
-msgid "Block Title"
+#: ../../Zotlabs/Access/Permissions.php:50
+msgid "Can view my file storage and photos"
msgstr ""
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Menu.php:114
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:258
-#: ../../include/page_widgets.php:47
-msgid "Created"
+#: ../../Zotlabs/Access/Permissions.php:51
+msgid "Can upload/modify my file storage and photos"
msgstr ""
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Menu.php:115
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:259
-#: ../../include/page_widgets.php:48
-msgid "Edited"
+#: ../../Zotlabs/Access/Permissions.php:52
+msgid "Can view my channel webpages"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Access/Permissions.php:53
+msgid "Can view my wiki pages"
msgstr ""
+#: ../../Zotlabs/Access/Permissions.php:54
+msgid "Can create/edit my channel webpages"
+=======
#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/New_channel.php:147
#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Menu.php:118
#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801
-#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Storage/Browser.php:228
+#: ../../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
@@ -293,27 +298,30 @@ msgstr ""
#: ../../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:298 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Wiki.php:275 ../../Zotlabs/Module/Menu.php:112
#: ../../Zotlabs/Module/Layouts.php:193
#: ../../Zotlabs/Module/Editwebpage.php:142
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Module/Editpost.php:80
+#: ../../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:1058
-#: ../../include/channel.php:1062 ../../include/menu.php:113
+#: ../../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
msgid "Edit"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1042
-#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:248
-#: ../../addon/cdav/include/widgets.php:123 ../../include/conversation.php:1309
-msgid "Share"
+#: ../../Zotlabs/Access/Permissions.php:55
+msgid "Can write to my wiki pages"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Access/Permissions.php:56
+msgid "Can post on my channel (wall) page"
+=======
#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138
#: ../../Zotlabs/Module/Admin/Accounts.php:173
#: ../../Zotlabs/Module/Admin/Channels.php:149
@@ -325,92 +333,98 @@ msgstr ""
#: ../../Zotlabs/Module/Connedit.php:919 ../../Zotlabs/Module/Group.php:177
#: ../../Zotlabs/Module/Profiles.php:803
#: ../../Zotlabs/Module/Editwebpage.php:167
-#: ../../Zotlabs/Module/Webpages.php:249 ../../Zotlabs/Lib/Apps.php:368
+#: ../../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:650 ../../include/conversation.php:687
+#: ../../include/conversation.php:654
msgid "Delete"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
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:253 ../../Zotlabs/Module/Pubsites.php:59
-#: ../../addon/gitwiki/Mod_Gitwiki.php:153 ../../include/page_widgets.php:42
-msgid "View"
+#: ../../Zotlabs/Access/Permissions.php:57
+msgid "Can comment on or like my posts"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
+#: ../../Zotlabs/Access/Permissions.php:58
+msgid "Can send me private mail messages"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../Zotlabs/Access/Permissions.php:59
+msgid "Can like/dislike profiles and profile things"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:67
-msgid "Please join us on $Projectname"
+#: ../../Zotlabs/Access/Permissions.php:60
+msgid "Can forward to all my channel connections via @+ mentions in posts"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:77
-msgid "Invitation limit exceeded. Please contact your site administrator."
+#: ../../Zotlabs/Access/Permissions.php:61
+msgid "Can chat with me"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:82
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../Zotlabs/Access/Permissions.php:62
+msgid "Can source my public posts in derived channels"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:86
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Invite.php:105
-msgid "You have no more invitations available"
+#: ../../Zotlabs/Access/Permissions.php:63
+msgid "Can administer my channel"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Send invitations"
+#: ../../Zotlabs/Storage/Browser.php:106 ../../Zotlabs/Storage/Browser.php:237
+msgid "parent"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:137
-msgid "Enter email addresses, one per line:"
+#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2706
+msgid "Collection"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:285
+<<<<<<< HEAD
+#: ../../Zotlabs/Storage/Browser.php:133
+msgid "Principal"
+=======
+#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:303
msgid "Your message:"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:139
-msgid "Please join my community on $Projectname."
+#: ../../Zotlabs/Storage/Browser.php:136
+msgid "Addressbook"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "You will need to supply this invitation code:"
+#: ../../Zotlabs/Storage/Browser.php:139
+msgid "Calendar"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "1. Register at any $Projectname location (they are all inter-connected)"
+#: ../../Zotlabs/Storage/Browser.php:142
+msgid "Schedule Inbox"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "2. Enter my $Projectname network address into the site searchbar."
+#: ../../Zotlabs/Storage/Browser.php:145
+msgid "Schedule Outbox"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:145
-msgid "or visit"
+#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:757
+#: ../../Zotlabs/Module/Photos.php:1213
+#: ../../Zotlabs/Module/Embedphotos.php:145 ../../Zotlabs/Lib/Apps.php:571
+#: ../../Zotlabs/Lib/Apps.php:649 ../../Zotlabs/Widget/Album.php:84
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:745
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:746
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:753
+#: ../../include/conversation.php:1110
+msgid "Unknown"
msgstr ""
-#: ../../Zotlabs/Module/Invite.php:147
-msgid "3. Click [Connect]"
+#: ../../Zotlabs/Storage/Browser.php:224 ../../Zotlabs/Module/Fbrowser.php:85
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/conversation.php:1782
+msgid "Files"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Storage/Browser.php:225
+msgid "Total"
+=======
#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Locs.php:121
#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Appman.php:148
+#: ../../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/Admin/Features.php:66
@@ -432,7 +446,7 @@ msgstr ""
#: ../../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:515 ../../Zotlabs/Module/Cal.php:343
+#: ../../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
@@ -441,11 +455,11 @@ msgstr ""
#: ../../Zotlabs/Module/Chat.php:240 ../../Zotlabs/Module/Pconfig.php:107
#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Profiles.php:726
#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
-#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:431
+#: ../../Zotlabs/Module/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:95
-#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:185
+#: ../../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
#: ../../addon/openclipatar/openclipatar.php:53
#: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92
@@ -470,287 +484,438 @@ 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:219 ../../addon/piwik/piwik.php:95
+#: ../../addon/smileybutton/smileybutton.php:281 ../../addon/piwik/piwik.php:95
#: ../../addon/pageheader/pageheader.php:48 ../../addon/xmpp/xmpp.php:69
#: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124
#: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22
msgid "Submit"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Editlayout.php:79 ../../Zotlabs/Module/Editblock.php:79
-#: ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editwebpage.php:80 ../../Zotlabs/Module/Editpost.php:24
-msgid "Item not found"
+#: ../../Zotlabs/Storage/Browser.php:227
+msgid "Shared"
msgstr ""
-#: ../../Zotlabs/Module/Editlayout.php:128 ../../Zotlabs/Module/Layouts.php:129
-#: ../../Zotlabs/Module/Layouts.php:189
-msgid "Layout Name"
+#: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:332
+#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Layouts.php:185
+#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/New_channel.php:147
+#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Blocks.php:159
+#: ../../extend/addon/addon/cdav/include/widgets.php:127
+#: ../../extend/addon/addon/cdav/include/widgets.php:164
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1151
+msgid "Create"
msgstr ""
-#: ../../Zotlabs/Module/Editlayout.php:129 ../../Zotlabs/Module/Layouts.php:132
-msgid "Layout Description (Optional)"
+#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:334
+#: ../../Zotlabs/Module/Cover_photo.php:361
+#: ../../Zotlabs/Module/Profile_photo.php:423
+#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1321
+#: ../../Zotlabs/Module/Embedphotos.php:157 ../../Zotlabs/Widget/Album.php:97
+#: ../../extend/addon/addon/cdav/include/widgets.php:132
+#: ../../extend/addon/addon/cdav/include/widgets.php:168
+msgid "Upload"
msgstr ""
-#: ../../Zotlabs/Module/Editlayout.php:137
-msgid "Edit Layout"
+#: ../../Zotlabs/Storage/Browser.php:233
+#: ../../Zotlabs/Module/Admin/Channels.php:159
+#: ../../Zotlabs/Module/Wiki.php:172 ../../Zotlabs/Module/Connedit.php:902
+#: ../../Zotlabs/Module/Sharedwithme.php:100
+#: ../../Zotlabs/Module/Settings/Oauth.php:89
+#: ../../Zotlabs/Module/Settings/Oauth.php:115
+#: ../../Zotlabs/Module/Chat.php:249 ../../Zotlabs/Lib/NativeWikiPage.php:528
+#: ../../Zotlabs/Widget/Wiki_page_history.php:22
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1136
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:172
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:158
+msgid "Name"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:173
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:159
+msgid "Type"
+=======
#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:72
#: ../../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:341
+#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:327
msgid "Permission denied"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
+#: ../../Zotlabs/Storage/Browser.php:235
+#: ../../Zotlabs/Module/Sharedwithme.php:102 ../../include/text.php:1415
+msgid "Size"
msgstr ""
-#: ../../Zotlabs/Module/Profperm.php:111
-msgid "Profile Visibility Editor"
+#: ../../Zotlabs/Storage/Browser.php:236
+#: ../../Zotlabs/Module/Sharedwithme.php:103
+msgid "Last Modified"
msgstr ""
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1376
+<<<<<<< HEAD
+#: ../../Zotlabs/Storage/Browser.php:238 ../../Zotlabs/Module/Layouts.php:193
+#: ../../Zotlabs/Module/Webpages.php:245
+#: ../../Zotlabs/Module/Connections.php:296
+#: ../../Zotlabs/Module/Connections.php:316
+#: ../../Zotlabs/Module/Admin/Profs.php:154
+#: ../../Zotlabs/Module/Editlayout.php:114
+#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Editblock.php:114
+#: ../../Zotlabs/Module/Wiki.php:165 ../../Zotlabs/Module/Wiki.php:275
+#: ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Settings/Oauth.php:149
+#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:107
+#: ../../Zotlabs/Lib/Apps.php:367
+#: ../../extend/addon/addon/cdav/include/widgets.php:125
+#: ../../extend/addon/addon/cdav/include/widgets.php:161
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252
+#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
+#: ../../include/channel.php:1043 ../../include/channel.php:1047
+#: ../../include/menu.php:113
+msgid "Edit"
+=======
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1362
msgid "Profile"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Click on a contact to add or remove."
+#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Profiles.php:803
+#: ../../Zotlabs/Module/Webpages.php:247
+#: ../../Zotlabs/Module/Connections.php:267
+#: ../../Zotlabs/Module/Admin/Profs.php:155
+#: ../../Zotlabs/Module/Admin/Accounts.php:173
+#: ../../Zotlabs/Module/Admin/Channels.php:149
+#: ../../Zotlabs/Module/Editlayout.php:138
+#: ../../Zotlabs/Module/Editwebpage.php:172 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Editblock.php:139
+#: ../../Zotlabs/Module/Connedit.php:650 ../../Zotlabs/Module/Connedit.php:919
+#: ../../Zotlabs/Module/Blocks.php:162
+#: ../../Zotlabs/Module/Settings/Oauth.php:150
+#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Photos.php:1143
+#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Lib/Apps.php:368
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:864
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1153
+#: ../../include/conversation.php:654
+msgid "Delete"
msgstr ""
-#: ../../Zotlabs/Module/Profperm.php:124
-msgid "Visible To"
+#: ../../Zotlabs/Storage/Browser.php:301
+#, php-format
+msgid "You are using %1$s of your available file storage."
msgstr ""
-#: ../../Zotlabs/Module/Profperm.php:140
-#: ../../Zotlabs/Module/Connections.php:141
-msgid "All Connections"
+#: ../../Zotlabs/Storage/Browser.php:306
+#, php-format
+msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
msgstr ""
-#: ../../Zotlabs/Module/Regdir.php:49 ../../Zotlabs/Module/Dirsearch.php:25
-msgid "This site is not a directory server"
+#: ../../Zotlabs/Storage/Browser.php:317
+msgid "WARNING:"
msgstr ""
-#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25
-#: ../../addon/gitwiki/Mod_Gitwiki.php:28 ../../addon/chess/chess.php:403
-msgid "You must be logged in to see this page."
+#: ../../Zotlabs/Storage/Browser.php:327
+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/Module/Channel.php:47 ../../Zotlabs/Module/Hcard.php:35
-#: ../../Zotlabs/Module/Profile.php:43
-msgid "Posts and comments"
+#: ../../Zotlabs/Storage/Browser.php:331
+msgid "Create new folder"
msgstr ""
-#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Hcard.php:42
-#: ../../Zotlabs/Module/Profile.php:50
-msgid "Only posts"
+#: ../../Zotlabs/Storage/Browser.php:333
+msgid "Upload file"
msgstr ""
-#: ../../Zotlabs/Module/Channel.php:112
-msgid "Insufficient permissions. Request redirected to profile page."
+#: ../../Zotlabs/Storage/Browser.php:347
+msgid "Drop files here to immediately upload"
msgstr ""
-#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
-msgid "Export Channel"
+#: ../../Zotlabs/Web/Router.php:146 ../../Zotlabs/Module/Page.php:94
+#: ../../Zotlabs/Module/Block.php:79 ../../Zotlabs/Module/Display.php:122
+#: ../../Zotlabs/Lib/NativeWikiPage.php:489 ../../include/help.php:68
+msgid "Page not found."
msgstr ""
-#: ../../Zotlabs/Module/Uexport.php:59
-msgid ""
-"Export your basic channel information to a file. This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
+#: ../../Zotlabs/Web/WebServer.php:130 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
+#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Like.php:283
+#: ../../Zotlabs/Module/Subthread.php:62 ../../Zotlabs/Module/Profperm.php:28
+#: ../../extend/addon/addon/frphotos/frphotos.php:81
+#: ../../extend/addon/addon/redfiles/redfiles.php:109
+#: ../../extend/addon/addon/redphotos/redphotos.php:119
+#: ../../include/items.php:325
+msgid "Permission denied"
msgstr ""
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export Content"
+#: ../../Zotlabs/Web/WebServer.php:131
+#: ../../Zotlabs/Module/Achievements.php:34
+#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Message.php:18
+#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Layouts.php:71
+#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Webpages.php:116
+#: ../../Zotlabs/Module/Connections.php:29
+#: ../../Zotlabs/Module/Cover_photo.php:281
+#: ../../Zotlabs/Module/Cover_photo.php:294
+#: ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Editlayout.php:90
+#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:104
+#: ../../Zotlabs/Module/Editwebpage.php:126
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Locs.php:87
+#: ../../Zotlabs/Module/Channel.php:115 ../../Zotlabs/Module/Channel.php:245
+#: ../../Zotlabs/Module/Channel.php:285
+#: ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Filestorage.php:78
+#: ../../Zotlabs/Module/Filestorage.php:93
+#: ../../Zotlabs/Module/Filestorage.php:120
+#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Setup.php:212 ../../Zotlabs/Module/Manage.php:10
+#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Mitem.php:115
+#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:216
+#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Api.php:24
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
+#: ../../Zotlabs/Module/New_channel.php:77
+#: ../../Zotlabs/Module/New_channel.php:104
+#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100
+#: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Blocks.php:73
+#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Rate.php:113
+#: ../../Zotlabs/Module/Profile_photo.php:280
+#: ../../Zotlabs/Module/Profile_photo.php:293
+#: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Common.php:39
+#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230
+#: ../../Zotlabs/Module/Item.php:1037 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Events.php:271
+#: ../../Zotlabs/Module/Service_limits.php:11
+#: ../../Zotlabs/Module/Bookmarks.php:61
+#: ../../Zotlabs/Module/Sharedwithme.php:11
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Sources.php:74
+#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Suggest.php:28
+#: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294
+#: ../../Zotlabs/Module/Thing.php:335
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
+#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Chat.php:98
+#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../extend/addon/addon/keepout/keepout.php:36
+#: ../../extend/addon/addon/pumpio/pumpio.php:40
+#: ../../extend/addon/addon/openid/Mod_Id.php:53
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:196
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:292
+#: ../../include/photos.php:28 ../../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:3395
+msgid "Permission denied."
msgstr ""
-#: ../../Zotlabs/Module/Uexport.php:61
+#: ../../Zotlabs/Zot/Auth.php:138
msgid ""
-"Export your channel information and recent content to a JSON backup that can "
-"be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large. Please be patient - it may take several minutes for "
-"this download to begin."
+"Remote authentication blocked. You are logged into this site locally. Please "
+"logout and retry."
msgstr ""
-#: ../../Zotlabs/Module/Uexport.php:63
-msgid "Export your posts from a given year."
+#: ../../Zotlabs/Zot/Auth.php:250
+#: ../../extend/addon/addon/openid/Mod_Openid.php:76
+#: ../../extend/addon/addon/openid/Mod_Openid.php:178
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
msgstr ""
-#: ../../Zotlabs/Module/Uexport.php:65
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
+#: ../../Zotlabs/Module/Achievements.php:15
+#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Connect.php:17
+#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Editwebpage.php:32
+#: ../../Zotlabs/Module/Filestorage.php:59
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
+#: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Blocks.php:33
+#: ../../include/channel.php:944
+msgid "Requested profile is not available."
msgstr ""
-#: ../../Zotlabs/Module/Uexport.php:66
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
-"\">%2$s</a>"
+#: ../../Zotlabs/Module/Achievements.php:38
+msgid "Some blurb about what to do when you're new here"
msgstr ""
-#: ../../Zotlabs/Module/Uexport.php:67
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
+#: ../../Zotlabs/Module/Register.php:49
+msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
msgstr ""
-#: ../../Zotlabs/Module/Uexport.php:68
-#, php-format
+#: ../../Zotlabs/Module/Register.php:55
msgid ""
-"These content files may be imported or restored by visiting <a href=\"%1$s\">"
-"%2$s</a> on any site containing your channel. For best results please import "
-"or restore these in date order (oldest first)."
+"Please indicate acceptance of the Terms of Service. Registration failed."
msgstr ""
-#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Photos.php:490
-#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Directory.php:63
-#: ../../Zotlabs/Module/Display.php:22
-#: ../../Zotlabs/Module/Viewconnections.php:23
-msgid "Public access denied."
+#: ../../Zotlabs/Module/Register.php:89
+msgid "Passwords do not match."
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Register.php:131
+msgid ""
+"Registration successful. Please check your email for validation instructions."
+=======
#: ../../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
msgid "Search"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Search.php:224
-#, php-format
-msgid "Items tagged with: %s"
+#: ../../Zotlabs/Module/Register.php:137
+msgid "Your registration is pending approval by the site owner."
msgstr ""
-#: ../../Zotlabs/Module/Search.php:226
-#, php-format
-msgid "Search results for: %s"
+#: ../../Zotlabs/Module/Register.php:140
+msgid "Your registration can not be processed."
msgstr ""
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
+#: ../../Zotlabs/Module/Register.php:184
+msgid "Registration on this hub is disabled."
msgstr ""
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
+#: ../../Zotlabs/Module/Register.php:193
+msgid "Registration on this hub is by approval only."
msgstr ""
-#: ../../Zotlabs/Module/Locs.php:66
-msgid ""
-"Please select another location to become primary before removing the primary "
-"location."
+#: ../../Zotlabs/Module/Register.php:194
+msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>"
msgstr ""
-#: ../../Zotlabs/Module/Locs.php:95
-msgid "Syncing locations"
+#: ../../Zotlabs/Module/Register.php:204
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
msgstr ""
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
+#: ../../Zotlabs/Module/Register.php:221 ../../Zotlabs/Module/Siteinfo.php:27
+msgid "Terms of Service"
msgstr ""
-#: ../../Zotlabs/Module/Locs.php:116
-msgid "Manage Channel Locations"
+#: ../../Zotlabs/Module/Register.php:227
+#, php-format
+msgid "I accept the %s for this website"
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"
+#: ../../Zotlabs/Module/Register.php:229
+#, php-format
+msgid "I am over 13 years of age and accept the %s for this website"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Register.php:233
+msgid "Your email address"
+=======
#: ../../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"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
+#: ../../Zotlabs/Module/Register.php:234
+msgid "Choose a password"
msgstr ""
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
-msgid "Drop"
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Please re-enter your password"
msgstr ""
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
+#: ../../Zotlabs/Module/Register.php:236
+msgid "Please enter your invitation code"
msgstr ""
-#: ../../Zotlabs/Module/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
+#: ../../Zotlabs/Module/Register.php:237
+#: ../../Zotlabs/Module/New_channel.php:134
+msgid "Name or caption"
msgstr ""
-#: ../../Zotlabs/Module/Locs.php:124
+#: ../../Zotlabs/Module/Register.php:237
+#: ../../Zotlabs/Module/New_channel.php:134
msgid ""
-"When possible, drop a location by logging into that website/hub and removing "
-"your channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:125
-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"
+"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
+"Group\""
msgstr ""
-#: ../../Zotlabs/Module/Apporder.php:35
-msgid "Use arrows to move the corresponding app up or down in the display list"
+#: ../../Zotlabs/Module/Register.php:239
+#: ../../Zotlabs/Module/New_channel.php:136
+msgid "Choose a short nickname"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144
-msgid "Menu not found."
+#: ../../Zotlabs/Module/Register.php:239
+#: ../../Zotlabs/Module/New_channel.php:136
+#, php-format
+msgid ""
+"Your nickname will be used to create an easy to remember channel address e."
+"g. nickname%s"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:52
-msgid "Unable to create element."
+#: ../../Zotlabs/Module/Register.php:240
+#: ../../Zotlabs/Module/New_channel.php:137
+msgid "Channel role and privacy"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:76
-msgid "Unable to update menu element."
+#: ../../Zotlabs/Module/Register.php:240
+#: ../../Zotlabs/Module/New_channel.php:137
+msgid "Select a channel role with your privacy requirements."
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:92
-msgid "Unable to add menu element."
+#: ../../Zotlabs/Module/Register.php:240
+#: ../../Zotlabs/Module/New_channel.php:137
+msgid "Read more about roles"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:120 ../../Zotlabs/Module/Menu.php:166
-#: ../../Zotlabs/Module/Xchan.php:41
-msgid "Not found."
+#: ../../Zotlabs/Module/Register.php:241
+msgid "no"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
-msgid "Menu Item Permissions"
+#: ../../Zotlabs/Module/Register.php:241
+msgid "yes"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:510
-msgid "(click to open/close)"
+#: ../../Zotlabs/Module/Register.php:253
+#: ../../Zotlabs/Module/Admin/Site.php:280
+msgid "Registration"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
-msgid "Link Name"
+#: ../../Zotlabs/Module/Register.php:258
+msgid "Membership on this site is by invitation only."
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
-msgid "Link or Submenu Target"
+#: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:145
+#: ../../boot.php:1572
+msgid "Register"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:161
-msgid "Enter URL of the link or select a menu name to create a submenu"
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Register.php:271
+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."
msgstr ""
+#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+=======
#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
msgid "Use magic-auth if available"
msgstr ""
@@ -766,9 +931,9 @@ msgstr ""
#: ../../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:1635
-#: ../../view/theme/redbasic/php/config.php:100
-#: ../../view/theme/redbasic/php/config.php:115 ../../addon/cdav/cdav.php:234
+#: ../../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
#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109
#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
@@ -792,8 +957,8 @@ 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:211
-#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/xmpp/xmpp.php:53
+#: ../../addon/smileybutton/smileybutton.php:273
+#: ../../addon/smileybutton/smileybutton.php:277 ../../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
@@ -812,9 +977,9 @@ msgstr ""
#: ../../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:1635
-#: ../../view/theme/redbasic/php/config.php:100
-#: ../../view/theme/redbasic/php/config.php:115 ../../addon/cdav/cdav.php:234
+#: ../../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
#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109
#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73
@@ -838,371 +1003,637 @@ 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:211
-#: ../../addon/smileybutton/smileybutton.php:215 ../../addon/xmpp/xmpp.php:53
+#: ../../addon/smileybutton/smileybutton.php:273
+#: ../../addon/smileybutton/smileybutton.php:277 ../../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
#: ../../include/dir_fns.php:145
msgid "Yes"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
-msgid "Open link in new window"
+#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Ratings.php:83
+#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Display.php:22
+#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../Zotlabs/Module/Photos.php:490
+msgid "Public access denied."
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
-msgid "Order in list"
-msgstr ""
+#: ../../Zotlabs/Module/Directory.php:245
+#, php-format
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] ""
+msgstr[1] ""
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
-msgid "Higher numbers will sink to bottom of listing"
+#: ../../Zotlabs/Module/Directory.php:256
+msgid "Gender: "
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:165
-msgid "Submit and finish"
+#: ../../Zotlabs/Module/Directory.php:258
+msgid "Status: "
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:166
-msgid "Submit and continue"
+#: ../../Zotlabs/Module/Directory.php:260
+msgid "Homepage: "
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:174
-msgid "Menu:"
+#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1272
+msgid "Age:"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:177
-msgid "Link Target"
+#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1133
+#: ../../include/event.php:52 ../../include/event.php:84
+msgid "Location:"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Edit menu"
+#: ../../Zotlabs/Module/Directory.php:320
+msgid "Description:"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:183
-msgid "Edit element"
+#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1288
+msgid "Hometown:"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:184
-msgid "Drop element"
+#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1296
+msgid "About:"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:185
-msgid "New element"
+#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54
+#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
+#: ../../include/connections.php:110 ../../include/channel.php:1118
+#: ../../include/conversation.php:1002
+msgid "Connect"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:186
-msgid "Edit this menu container"
+#: ../../Zotlabs/Module/Directory.php:329
+msgid "Public Forum:"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:187
-msgid "Add menu element"
+#: ../../Zotlabs/Module/Directory.php:332
+msgid "Keywords: "
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:188
-msgid "Delete this menu item"
+#: ../../Zotlabs/Module/Directory.php:335
+msgid "Don't suggest"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:189
-msgid "Edit this menu item"
+#: ../../Zotlabs/Module/Directory.php:337
+msgid "Common connections:"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:206
-msgid "Menu item not found."
+#: ../../Zotlabs/Module/Directory.php:386
+msgid "Global Directory"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:219
-msgid "Menu item deleted."
+#: ../../Zotlabs/Module/Directory.php:386
+msgid "Local Directory"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:221
-msgid "Menu item could not be deleted."
+#: ../../Zotlabs/Module/Directory.php:391
+#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Zotlabs/Module/Connections.php:315
+#: ../../include/contact_widgets.php:23
+msgid "Find"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:228
-msgid "Edit Menu Element"
+#: ../../Zotlabs/Module/Directory.php:392
+msgid "Finding:"
msgstr ""
-#: ../../Zotlabs/Module/Mitem.php:238
-msgid "Link text"
+#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62
+#: ../../include/contact_widgets.php:24
+msgid "Channel Suggestions"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:25
-msgid "Calendar entries imported."
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "next page"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:27
-msgid "No calendar entries found."
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "previous page"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:110
-msgid "Event can not end before it has started."
+#: ../../Zotlabs/Module/Directory.php:398
+msgid "Sort options"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
-#: ../../Zotlabs/Module/Events.php:143
-msgid "Unable to generate preview."
+#: ../../Zotlabs/Module/Directory.php:399
+msgid "Alphabetic"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:119
-msgid "Event title and start time are required."
+#: ../../Zotlabs/Module/Directory.php:400
+msgid "Reverse Alphabetic"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
-msgid "Event not found."
+#: ../../Zotlabs/Module/Directory.php:401
+msgid "Newest to Oldest"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Directory.php:402
+msgid "Oldest to Newest"
+=======
#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:51
#: ../../Zotlabs/Module/Like.php:372 ../../include/conversation.php:119
-#: ../../include/text.php:1954 ../../include/event.php:1141
+#: ../../include/text.php:1940 ../../include/event.php:1141
msgid "event"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Events.php:460
-msgid "Edit event title"
+#: ../../Zotlabs/Module/Directory.php:419
+msgid "No entries (some entries may be hidden)."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:460 ../../addon/cdav/Mod_Cdav.php:835
-msgid "Event title"
+#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
+#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659
+msgid "Profile not found."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../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"
+#: ../../Zotlabs/Module/Profiles.php:44
+msgid "Profile deleted."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Categories (comma-separated list)"
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
+msgid "Profile-"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:463
-msgid "Edit Category"
+#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
+msgid "New profile created."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:463
-msgid "Category"
+#: ../../Zotlabs/Module/Profiles.php:111
+msgid "Profile unavailable to clone."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:466
-msgid "Edit start date and time"
+#: ../../Zotlabs/Module/Profiles.php:146
+msgid "Profile unavailable to export."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:466 ../../addon/cdav/Mod_Cdav.php:836
-msgid "Start date and time"
+#: ../../Zotlabs/Module/Profiles.php:252
+msgid "Profile Name is required."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
-msgid "Finish date and time are not known or not relevant"
+#: ../../Zotlabs/Module/Profiles.php:459
+msgid "Marital Status"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:469
-msgid "Edit finish date and time"
+#: ../../Zotlabs/Module/Profiles.php:463
+msgid "Romantic Partner"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:469
-msgid "Finish date and time"
+#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775
+msgid "Likes"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
-msgid "Adjust for viewer timezone"
+#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776
+msgid "Dislikes"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:471
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
+#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783
+msgid "Work/Employment"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:473
-msgid "Edit Description"
+#: ../../Zotlabs/Module/Profiles.php:478
+msgid "Religion"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Appman.php:138
-#: ../../Zotlabs/Module/Rbmark.php:101
-#: ../../addon/rendezvous/rendezvous.php:173 ../../addon/cdav/Mod_Cdav.php:838
-msgid "Description"
+#: ../../Zotlabs/Module/Profiles.php:482
+msgid "Political Views"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:475
-msgid "Edit Location"
+#: ../../Zotlabs/Module/Profiles.php:486
+#: ../../extend/addon/addon/openid/MysqlProvider.php:74
+msgid "Gender"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1063
-#: ../../Zotlabs/Module/Webpages.php:254 ../../Zotlabs/Lib/ThreadItem.php:741
-#: ../../include/conversation.php:1278 ../../include/page_widgets.php:43
-msgid "Preview"
+#: ../../Zotlabs/Module/Profiles.php:490
+msgid "Sexual Preference"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1341
-msgid "Permission settings"
+#: ../../Zotlabs/Module/Profiles.php:494
+msgid "Homepage"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:489
-msgid "Timezone:"
+#: ../../Zotlabs/Module/Profiles.php:498
+msgid "Interests"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:494
-msgid "Advanced Options"
+#: ../../Zotlabs/Module/Profiles.php:502 ../../Zotlabs/Module/Profiles.php:793
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:909
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143
+msgid "Address"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:264
-msgid "l, F j"
+#: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51
+#: ../../Zotlabs/Module/Events.php:475
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839
+#: ../../include/js_strings.php:25
+msgid "Location"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:633
-msgid "Edit event"
+#: ../../Zotlabs/Module/Profiles.php:594
+msgid "Profile updated."
msgstr ""
-#: ../../Zotlabs/Module/Events.php:635
-msgid "Delete event"
+#: ../../Zotlabs/Module/Profiles.php:678
+msgid "Hide your connections list from viewers of this profile"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Profiles.php:681
+#: ../../Zotlabs/Module/Admin/Site.php:237 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Wiki.php:180
+#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Connedit.php:392
+#: ../../Zotlabs/Module/Connedit.php:775 ../../Zotlabs/Module/Events.php:470
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings/Display.php:103
+#: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Photos.php:642
+#: ../../extend/addon/addon/dwpost/dwpost.php:73
+#: ../../extend/addon/addon/dwpost/dwpost.php:85
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
+#: ../../extend/addon/addon/ijpost/ijpost.php:73
+#: ../../extend/addon/addon/ijpost/ijpost.php:85
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
+#: ../../extend/addon/addon/libertree/libertree.php:69
+#: ../../extend/addon/addon/libertree/libertree.php:81
+#: ../../extend/addon/addon/ljpost/ljpost.php:70
+#: ../../extend/addon/addon/ljpost/ljpost.php:82
+#: ../../extend/addon/addon/nofed/nofed.php:72
+#: ../../extend/addon/addon/nofed/nofed.php:76
+#: ../../extend/addon/addon/nsabait/nsabait.php:157
+#: ../../extend/addon/addon/nsfw/nsfw.php:84
+#: ../../extend/addon/addon/planets/planets.php:153
+#: ../../extend/addon/addon/pumpio/pumpio.php:219
+#: ../../extend/addon/addon/pumpio/pumpio.php:223
+#: ../../extend/addon/addon/pumpio/pumpio.php:227
+#: ../../extend/addon/addon/pumpio/pumpio.php:231
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
+#: ../../extend/addon/addon/redred/redred.php:95
+#: ../../extend/addon/addon/redred/redred.php:99
+#: ../../extend/addon/addon/rtof/rtof.php:81
+#: ../../extend/addon/addon/rtof/rtof.php:85
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
+#: ../../extend/addon/addon/statusnet/statusnet.php:389
+#: ../../extend/addon/addon/statusnet/statusnet.php:411
+#: ../../extend/addon/addon/statusnet/statusnet.php:415
+#: ../../extend/addon/addon/statusnet/statusnet.php:424
+#: ../../extend/addon/addon/twitter/twitter.php:242
+#: ../../extend/addon/addon/twitter/twitter.php:246
+#: ../../extend/addon/addon/twitter/twitter.php:255
+#: ../../extend/addon/addon/visage/visage.php:166
+#: ../../extend/addon/addon/wppost/wppost.php:82
+#: ../../extend/addon/addon/wppost/wppost.php:105
+#: ../../extend/addon/addon/wppost/wppost.php:109
+#: ../../extend/addon/addon/xmpp/xmpp.php:53
+#: ../../extend/addon/addon/cdav/cdav.php:234
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:104 ../../boot.php:1595
+msgid "No"
+=======
#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:313
-#: ../../include/text.php:1773
+#: ../../include/text.php:1759
msgid "Link to Source"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Events.php:669
-msgid "calendar"
+#: ../../Zotlabs/Module/Profiles.php:681
+#: ../../Zotlabs/Module/Admin/Site.php:239 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Wiki.php:180
+#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Connedit.php:392
+#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
+#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings/Display.php:103
+#: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Photos.php:642
+#: ../../extend/addon/addon/dwpost/dwpost.php:73
+#: ../../extend/addon/addon/dwpost/dwpost.php:85
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
+#: ../../extend/addon/addon/ijpost/ijpost.php:73
+#: ../../extend/addon/addon/ijpost/ijpost.php:85
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
+#: ../../extend/addon/addon/libertree/libertree.php:69
+#: ../../extend/addon/addon/libertree/libertree.php:81
+#: ../../extend/addon/addon/ljpost/ljpost.php:70
+#: ../../extend/addon/addon/ljpost/ljpost.php:82
+#: ../../extend/addon/addon/nofed/nofed.php:72
+#: ../../extend/addon/addon/nofed/nofed.php:76
+#: ../../extend/addon/addon/nsabait/nsabait.php:157
+#: ../../extend/addon/addon/nsfw/nsfw.php:84
+#: ../../extend/addon/addon/planets/planets.php:153
+#: ../../extend/addon/addon/pumpio/pumpio.php:219
+#: ../../extend/addon/addon/pumpio/pumpio.php:223
+#: ../../extend/addon/addon/pumpio/pumpio.php:227
+#: ../../extend/addon/addon/pumpio/pumpio.php:231
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
+#: ../../extend/addon/addon/redred/redred.php:95
+#: ../../extend/addon/addon/redred/redred.php:99
+#: ../../extend/addon/addon/rtof/rtof.php:81
+#: ../../extend/addon/addon/rtof/rtof.php:85
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
+#: ../../extend/addon/addon/statusnet/statusnet.php:389
+#: ../../extend/addon/addon/statusnet/statusnet.php:411
+#: ../../extend/addon/addon/statusnet/statusnet.php:415
+#: ../../extend/addon/addon/statusnet/statusnet.php:424
+#: ../../extend/addon/addon/twitter/twitter.php:242
+#: ../../extend/addon/addon/twitter/twitter.php:246
+#: ../../extend/addon/addon/twitter/twitter.php:255
+#: ../../extend/addon/addon/visage/visage.php:166
+#: ../../extend/addon/addon/wppost/wppost.php:82
+#: ../../extend/addon/addon/wppost/wppost.php:105
+#: ../../extend/addon/addon/wppost/wppost.php:109
+#: ../../extend/addon/addon/xmpp/xmpp.php:53
+#: ../../extend/addon/addon/cdav/cdav.php:234
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:104 ../../boot.php:1595
+msgid "Yes"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:336
-msgid "Edit Event"
+#: ../../Zotlabs/Module/Profiles.php:725
+msgid "Edit Profile Details"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:336
-msgid "Create Event"
+#: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Import.php:514
+#: ../../Zotlabs/Module/Admin/Features.php:66
+#: ../../Zotlabs/Module/Admin/Logs.php:84
+#: ../../Zotlabs/Module/Admin/Profs.php:157
+#: ../../Zotlabs/Module/Admin/Security.php:104
+#: ../../Zotlabs/Module/Admin/Account_edit.php:74
+#: ../../Zotlabs/Module/Admin/Accounts.php:166
+#: ../../Zotlabs/Module/Admin/Channels.php:147
+#: ../../Zotlabs/Module/Admin/Plugins.php:438
+#: ../../Zotlabs/Module/Admin/Themes.php:158
+#: ../../Zotlabs/Module/Admin/Site.php:279 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Group.php:85
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
+#: ../../Zotlabs/Module/Import_items.php:129
+#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Wiki.php:169
+#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Poke.php:186
+#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Cal.php:343
+#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Appman.php:134
+#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Events.php:493
+#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
+#: ../../Zotlabs/Module/Mail.php:425
+#: ../../Zotlabs/Module/Settings/Features.php:47
+#: ../../Zotlabs/Module/Settings/Oauth.php:87
+#: ../../Zotlabs/Module/Settings/Account.php:118
+#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Zotlabs/Module/Settings/Tokens.php:168
+#: ../../Zotlabs/Module/Settings/Channel.php:476
+#: ../../Zotlabs/Module/Settings/Permcats.php:110
+#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
+#: ../../Zotlabs/Module/Photos.php:657 ../../Zotlabs/Module/Photos.php:1022
+#: ../../Zotlabs/Module/Photos.php:1062 ../../Zotlabs/Module/Photos.php:1180
+#: ../../Zotlabs/Module/Chat.php:194 ../../Zotlabs/Module/Chat.php:240
+#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:732
+#: ../../Zotlabs/Widget/Eventstools.php:16
+#: ../../extend/addon/addon/chords/Mod_Chords.php:60
+#: ../../extend/addon/addon/dwpost/dwpost.php:89
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124
+#: ../../extend/addon/addon/frphotos/frphotos.php:96
+#: ../../extend/addon/addon/hubwall/hubwall.php:95
+#: ../../extend/addon/addon/ijpost/ijpost.php:89
+#: ../../extend/addon/addon/irc/irc.php:53
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:371
+#: ../../extend/addon/addon/libertree/libertree.php:85
+#: ../../extend/addon/addon/ljpost/ljpost.php:86
+#: ../../extend/addon/addon/logrot/logrot.php:35
+#: ../../extend/addon/addon/mailhost/mailhost.php:40
+#: ../../extend/addon/addon/nofed/nofed.php:80
+#: ../../extend/addon/addon/nsabait/nsabait.php:161
+#: ../../extend/addon/addon/nsfw/nsfw.php:92
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:53
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:168
+#: ../../extend/addon/addon/pageheader/pageheader.php:48
+#: ../../extend/addon/addon/piwik/piwik.php:95
+#: ../../extend/addon/addon/planets/planets.php:157
+#: ../../extend/addon/addon/pumpio/pumpio.php:237
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85
+#: ../../extend/addon/addon/redfiles/redfiles.php:124
+#: ../../extend/addon/addon/redphotos/redphotos.php:136
+#: ../../extend/addon/addon/redred/redred.php:119
+#: ../../extend/addon/addon/rtof/rtof.php:101
+#: ../../extend/addon/addon/skeleton/skeleton.php:65
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:281
+#: ../../extend/addon/addon/startpage/startpage.php:113
+#: ../../extend/addon/addon/statusnet/statusnet.php:322
+#: ../../extend/addon/addon/statusnet/statusnet.php:380
+#: ../../extend/addon/addon/statusnet/statusnet.php:432
+#: ../../extend/addon/addon/statusnet/statusnet.php:899
+#: ../../extend/addon/addon/superblock/superblock.php:120
+#: ../../extend/addon/addon/twitter/twitter.php:217
+#: ../../extend/addon/addon/twitter/twitter.php:259
+#: ../../extend/addon/addon/visage/visage.php:170
+#: ../../extend/addon/addon/wppost/wppost.php:113
+#: ../../extend/addon/addon/xmpp/xmpp.php:69
+#: ../../extend/addon/addon/cdav/cdav.php:246
+#: ../../extend/addon/addon/likebanner/likebanner.php:57
+#: ../../extend/addon/addon/mailtest/mailtest.php:100
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155
+#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:84
+msgid "Submit"
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"
+#: ../../Zotlabs/Module/Profiles.php:727
+msgid "View this profile"
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"
+#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
+#: ../../include/channel.php:1065
+msgid "Edit visibility"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Profiles.php:729
+msgid "Profile Tools"
+=======
#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:339
-#: ../../include/channel.php:1379
+#: ../../include/channel.php:1365
msgid "Export"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Events.php:695 ../../addon/cdav/Mod_Cdav.php:849
-msgid "Month"
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Change cover photo"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:696 ../../addon/cdav/Mod_Cdav.php:850
-msgid "Week"
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1036
+msgid "Change profile photo"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:697 ../../addon/cdav/Mod_Cdav.php:851
-msgid "Day"
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Create a new profile using these settings"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Cal.php:346
-#: ../../addon/cdav/Mod_Cdav.php:848
-msgid "Today"
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Clone this profile"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:731
-msgid "Event removed"
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Delete this profile"
msgstr ""
-#: ../../Zotlabs/Module/Events.php:734
-msgid "Failed to remove event"
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Add profile things"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55
-msgid "App installed."
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1648
+msgid "Personal"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:48
-msgid "Malformed app."
+#: ../../Zotlabs/Module/Profiles.php:738
+msgid "Relation"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:125
-msgid "Embed code"
+#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55
+msgid "Miscellaneous"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:131
-msgid "Edit App"
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Import profile from file"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:131
-msgid "Create App"
+#: ../../Zotlabs/Module/Profiles.php:742
+msgid "Export profile to file"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:136
-msgid "Name of app"
+#: ../../Zotlabs/Module/Profiles.php:743
+msgid "Your gender"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:137
-msgid "Location (URL) of app"
+#: ../../Zotlabs/Module/Profiles.php:744
+msgid "Marital status"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:139
-msgid "Photo icon URL"
+#: ../../Zotlabs/Module/Profiles.php:745
+msgid "Sexual preference"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:139
-msgid "80 x 80 pixels - optional"
+#: ../../Zotlabs/Module/Profiles.php:748
+msgid "Profile name"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:140
-msgid "Categories (optional, comma separated list)"
+#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752
+#: ../../Zotlabs/Module/Appman.php:122 ../../Zotlabs/Module/Appman.php:123
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
+#: ../../include/datetime.php:259
+msgid "Required"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:141
-msgid "Version ID"
+#: ../../Zotlabs/Module/Profiles.php:750
+msgid "This is your default profile."
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:142
-msgid "Price of app"
+#: ../../Zotlabs/Module/Profiles.php:752
+msgid "Your full name"
msgstr ""
-#: ../../Zotlabs/Module/Appman.php:143
-msgid "Location (URL) to purchase app"
+#: ../../Zotlabs/Module/Profiles.php:753
+msgid "Title/Description"
msgstr ""
-#: ../../Zotlabs/Module/Regmod.php:15
-msgid "Please login."
+#: ../../Zotlabs/Module/Profiles.php:756
+msgid "Street address"
msgstr ""
-#: ../../Zotlabs/Module/Magic.php:71
-msgid "Hub not found."
+#: ../../Zotlabs/Module/Profiles.php:757
+msgid "Locality/City"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Profiles.php:758
+msgid "Region/State"
msgstr ""
+#: ../../Zotlabs/Module/Profiles.php:759
+msgid "Postal/Zip code"
+=======
#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Tagger.php:47
#: ../../Zotlabs/Module/Like.php:370
#: ../../addon/redphotos/redphotohelper.php:71
-#: ../../addon/diaspora/inbound.php:1782 ../../include/conversation.php:116
-#: ../../include/text.php:1951
+#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:116
+#: ../../include/text.php:1937
msgid "photo"
msgstr ""
#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Like.php:370
-#: ../../addon/diaspora/inbound.php:1782 ../../include/conversation.php:144
-#: ../../include/text.php:1957
+#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:144
+#: ../../include/text.php:1943
msgid "status"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Subthread.php:118
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
+#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:927
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
+msgid "Country"
msgstr ""
-#: ../../Zotlabs/Module/Subthread.php:120
-#, php-format
-msgid "%1$s stopped following %2$s's %3$s"
+#: ../../Zotlabs/Module/Profiles.php:765
+msgid "Who (if applicable)"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Profiles.php:765
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:766
+msgid "Since (date)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:769
+msgid "Tell us about yourself"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../extend/addon/addon/openid/MysqlProvider.php:68
+msgid "Homepage URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:771
+msgid "Hometown"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:772
+msgid "Political views"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:773
+msgid "Religious views"
msgstr ""
+#: ../../Zotlabs/Module/Profiles.php:774
+msgid "Keywords used in directory listings"
+=======
#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64
msgid "Nothing to import."
msgstr ""
@@ -1234,119 +1665,129 @@ 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:502
+#: ../../Zotlabs/Module/Import.php:501
msgid "File to Upload"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/New_channel.php:121 ../../Zotlabs/Module/Manage.php:136
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
+#: ../../Zotlabs/Module/Profiles.php:774
+msgid "Example: fishing photography software"
msgstr ""
-#: ../../Zotlabs/Module/New_channel.php:134
-#: ../../Zotlabs/Module/Register.php:237
-msgid "Name or caption"
+#: ../../Zotlabs/Module/Profiles.php:777
+msgid "Musical interests"
msgstr ""
-#: ../../Zotlabs/Module/New_channel.php:134
-#: ../../Zotlabs/Module/Register.php:237
-msgid ""
-"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
-"Group\""
+#: ../../Zotlabs/Module/Profiles.php:778
+msgid "Books, literature"
msgstr ""
-#: ../../Zotlabs/Module/New_channel.php:136
-#: ../../Zotlabs/Module/Register.php:239
-msgid "Choose a short nickname"
+#: ../../Zotlabs/Module/Profiles.php:779
+msgid "Television"
msgstr ""
-#: ../../Zotlabs/Module/New_channel.php:136
-#: ../../Zotlabs/Module/Register.php:239
-#, php-format
-msgid ""
-"Your nickname will be used to create an easy to remember channel address e."
-"g. nickname%s"
+#: ../../Zotlabs/Module/Profiles.php:780
+msgid "Film/Dance/Culture/Entertainment"
msgstr ""
-#: ../../Zotlabs/Module/New_channel.php:137
-#: ../../Zotlabs/Module/Register.php:240
-msgid "Channel role and privacy"
+#: ../../Zotlabs/Module/Profiles.php:781
+msgid "Hobbies/Interests"
msgstr ""
-#: ../../Zotlabs/Module/New_channel.php:137
-#: ../../Zotlabs/Module/Register.php:240
-msgid "Select a channel role with your privacy requirements."
+#: ../../Zotlabs/Module/Profiles.php:782
+msgid "Love/Romance"
msgstr ""
-#: ../../Zotlabs/Module/New_channel.php:137
-#: ../../Zotlabs/Module/Register.php:240
-msgid "Read more about roles"
+#: ../../Zotlabs/Module/Profiles.php:784
+msgid "School/Education"
msgstr ""
-#: ../../Zotlabs/Module/New_channel.php:140
-msgid "Create Channel"
+#: ../../Zotlabs/Module/Profiles.php:785
+msgid "Contact information and social networks"
msgstr ""
-#: ../../Zotlabs/Module/New_channel.php:141
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
+#: ../../Zotlabs/Module/Profiles.php:786
+msgid "My other channels"
msgstr ""
-#: ../../Zotlabs/Module/New_channel.php:142
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
+#: ../../Zotlabs/Module/Profiles.php:788
+msgid "Communications"
msgstr ""
-#: ../../Zotlabs/Module/Removeme.php:35
-msgid ""
-"Channel removals are not allowed within 48 hours of changing the account "
-"password."
+#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:905
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
+msgid "Phone"
msgstr ""
-#: ../../Zotlabs/Module/Removeme.php:60
-msgid "Remove This Channel"
+#: ../../Zotlabs/Module/Profiles.php:790
+#: ../../Zotlabs/Module/Admin/Accounts.php:169
+#: ../../Zotlabs/Module/Admin/Accounts.php:181
+#: ../../Zotlabs/Module/Connedit.php:906
+#: ../../extend/addon/addon/redred/redred.php:107
+#: ../../extend/addon/addon/rtof/rtof.php:93
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1140
+#: ../../extend/addon/addon/openid/MysqlProvider.php:56
+#: ../../extend/addon/addon/openid/MysqlProvider.php:57
+#: ../../include/network.php:1749
+msgid "Email"
msgstr ""
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-msgid "WARNING: "
+#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Connedit.php:907
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141
+msgid "Instant messenger"
msgstr ""
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "This channel will be completely removed from the network. "
+#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Connedit.php:908
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142
+msgid "Website"
msgstr ""
-#: ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Removeaccount.php:58
-msgid "This action is permanent and can not be undone!"
+#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:910
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144
+msgid "Note"
msgstr ""
-#: ../../Zotlabs/Module/Removeme.php:62
-#: ../../Zotlabs/Module/Removeaccount.php:59
-msgid "Please enter your password for verification:"
+#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Connedit.php:911
+#: ../../extend/addon/addon/cdav/cdav.php:270
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145
+#: ../../include/connections.php:668
+msgid "Mobile"
msgstr ""
-#: ../../Zotlabs/Module/Removeme.php:63
-msgid "Remove this channel and all its clones from the network"
+#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Connedit.php:912
+#: ../../extend/addon/addon/cdav/cdav.php:271
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146
+#: ../../include/connections.php:669
+msgid "Home"
msgstr ""
-#: ../../Zotlabs/Module/Removeme.php:63
-msgid ""
-"By default only the instance of the channel located on this hub will be "
-"removed from the network"
+#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Connedit.php:913
+#: ../../extend/addon/addon/cdav/cdav.php:274
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147
+#: ../../include/connections.php:672
+msgid "Work"
msgstr ""
-#: ../../Zotlabs/Module/Removeme.php:64
-#: ../../Zotlabs/Module/Settings/Channel.php:575
-msgid "Remove Channel"
+#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Connedit.php:915
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:368
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149
+msgid "Add Contact"
msgstr ""
-#: ../../Zotlabs/Module/Sharedwithme.php:99
-msgid "Files: shared with me"
+#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Connedit.php:916
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150
+msgid "Add Field"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Module/Admin/Plugins.php:453
+#: ../../Zotlabs/Module/Connedit.php:918
+#: ../../Zotlabs/Module/Settings/Oauth.php:42
+#: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:358
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152
+msgid "Update"
+=======
#: ../../Zotlabs/Module/Sharedwithme.php:100
#: ../../Zotlabs/Module/Admin/Channels.php:159
#: ../../Zotlabs/Module/Settings/Oauth.php:89
@@ -1358,734 +1799,754 @@ msgstr ""
#: ../../addon/rendezvous/rendezvous.php:172 ../../addon/cdav/Mod_Cdav.php:1136
#: ../../addon/gitwiki/Mod_Gitwiki.php:158
msgid "Name"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Sharedwithme.php:101
-msgid "NEW"
+#: ../../Zotlabs/Module/Profiles.php:804
+#: ../../Zotlabs/Module/Admin/Plugins.php:423
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Wiki.php:265
+#: ../../Zotlabs/Module/Wiki.php:290 ../../Zotlabs/Module/Connedit.php:920
+#: ../../Zotlabs/Module/Settings/Oauth.php:88
+#: ../../Zotlabs/Module/Settings/Oauth.php:114
+#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
+#: ../../extend/addon/addon/js_upload/js_upload.php:46
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:866
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:244
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267
+#: ../../include/conversation.php:1327 ../../include/conversation.php:1376
+msgid "Cancel"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1061
+msgid "Profile Image"
+=======
#: ../../Zotlabs/Module/Sharedwithme.php:102
-#: ../../Zotlabs/Storage/Browser.php:235 ../../include/text.php:1407
+#: ../../Zotlabs/Storage/Browser.php:235 ../../include/text.php:1409
msgid "Size"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Sharedwithme.php:103
-#: ../../Zotlabs/Storage/Browser.php:236
-msgid "Last Modified"
-msgstr ""
-
-#: ../../Zotlabs/Module/Sharedwithme.php:104
-msgid "Remove all files"
+#: ../../Zotlabs/Module/Profiles.php:833 ../../include/nav.php:105
+#: ../../include/channel.php:1043
+msgid "Edit Profiles"
msgstr ""
-#: ../../Zotlabs/Module/Sharedwithme.php:105
-msgid "Remove this file"
+#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:143
+#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Chat.php:254
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154
+msgid "Create New"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:176
-msgid "$Projectname Server - Setup"
+#: ../../Zotlabs/Module/Help.php:23
+msgid "Documentation Search"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:180
-msgid "Could not connect to database."
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1764
+msgid "About"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:184
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
+#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:197
+msgid "Members"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:191
-msgid "Could not create table."
+#: ../../Zotlabs/Module/Help.php:82
+msgid "Administrators"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:196
-msgid "Your site database has been installed."
+#: ../../Zotlabs/Module/Help.php:83
+msgid "Developers"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:200
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
+#: ../../Zotlabs/Module/Help.php:84
+msgid "Tutorials"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Setup.php:753
-msgid "Please see the file \"install/INSTALL.txt\"."
+#: ../../Zotlabs/Module/Help.php:93
+msgid "$Projectname Documentation"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:260
-msgid "System check"
+#: ../../Zotlabs/Module/Help.php:94
+msgid "Contents"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:265
-msgid "Check again"
+#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Zotlabs/Module/Editlayout.php:128
+msgid "Layout Name"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:287
-msgid "Database connection"
+#: ../../Zotlabs/Module/Layouts.php:132
+#: ../../Zotlabs/Module/Editlayout.php:129
+msgid "Layout Description (Optional)"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:288
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2296
+msgid "Layouts"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:289
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232
+#: ../../include/nav.php:157 ../../include/nav.php:264
+#: ../../include/help.php:55 ../../include/help.php:61
+msgid "Help"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:290
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+#: ../../Zotlabs/Module/Layouts.php:186
+msgid "Comanche page description language help"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Database Server Name"
+#: ../../Zotlabs/Module/Layouts.php:190
+msgid "Layout Description"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Default is 127.0.0.1"
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:256
+#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Blocks.php:157
+#: ../../include/page_widgets.php:47
+msgid "Created"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Database Port"
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:257
+#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Blocks.php:158
+#: ../../include/page_widgets.php:48
+msgid "Edited"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Communication port number - use 0 for default"
+#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:246
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1042
+#: ../../extend/addon/addon/cdav/include/widgets.php:123
+#: ../../include/conversation.php:1311
+msgid "Share"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:296
-msgid "Database Login Name"
+#: ../../Zotlabs/Module/Layouts.php:195
+msgid "Download PDL file"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:297
-msgid "Database Login Password"
+#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Webpages.php:251
+#: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Wiki.php:167
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153
+#: ../../include/page_widgets.php:42
+msgid "View"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:298
-msgid "Database Name"
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:299
-msgid "Database Type"
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
-msgid "Site administrator email address"
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
+#: ../../Zotlabs/Module/Connect.php:93
msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
-msgid "Website URL"
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
-msgid "Please use SSL (https) URL if available."
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:353
-msgid "Please select a default timezone for your website"
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided "
+"on this page."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:328 ../../Zotlabs/Module/Admin/Site.php:258
-msgid "Basic/Minimal Social Networking"
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:329 ../../Zotlabs/Module/Admin/Site.php:259
-msgid "Standard Configuration (default)"
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:330 ../../Zotlabs/Module/Admin/Site.php:260
-msgid "Professional"
+#: ../../Zotlabs/Module/Admin.php:60
+#: ../../Zotlabs/Module/Admin/Plugins.php:259
+#: ../../Zotlabs/Module/Admin/Themes.php:72
+#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:35
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../Zotlabs/Module/Thing.php:89
+#: ../../include/items.php:3316
+msgid "Item not found."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:336
-msgid "Site settings"
+#: ../../Zotlabs/Module/Admin.php:94
+msgid "# Accounts"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:351 ../../Zotlabs/Module/Admin/Site.php:289
-msgid "Server Configuration/Role"
+#: ../../Zotlabs/Module/Admin.php:95
+msgid "# blocked accounts"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:392
-msgid "PHP version 5.5 or greater is required."
+#: ../../Zotlabs/Module/Admin.php:96
+msgid "# expired accounts"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:393
-msgid "PHP version"
+#: ../../Zotlabs/Module/Admin.php:97
+msgid "# expiring accounts"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:409
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../Zotlabs/Module/Admin.php:108
+msgid "# Channels"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:410
-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."
+#: ../../Zotlabs/Module/Admin.php:109
+msgid "# primary"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:414
-msgid "PHP executable path"
+#: ../../Zotlabs/Module/Admin.php:110
+msgid "# clones"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:414
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
+#: ../../Zotlabs/Module/Admin.php:116
+msgid "Message queues"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:419
-msgid "Command line PHP"
+#: ../../Zotlabs/Module/Admin.php:133
+msgid "Your software should be updated"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:429
-msgid ""
-"Unable to check command line PHP, as shell_exec() is disabled. This is "
-"required."
+#: ../../Zotlabs/Module/Admin.php:137 ../../Zotlabs/Module/Admin/Logs.php:82
+#: ../../Zotlabs/Module/Admin/Security.php:86
+#: ../../Zotlabs/Module/Admin/Accounts.php:164
+#: ../../Zotlabs/Module/Admin/Channels.php:145
+#: ../../Zotlabs/Module/Admin/Plugins.php:341
+#: ../../Zotlabs/Module/Admin/Plugins.php:436
+#: ../../Zotlabs/Module/Admin/Themes.php:122
+#: ../../Zotlabs/Module/Admin/Themes.php:156
+#: ../../Zotlabs/Module/Admin/Site.php:277
+msgid "Administration"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:432
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../Zotlabs/Module/Admin.php:138
+msgid "Summary"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:433
-msgid "This is required for message delivery to work."
+#: ../../Zotlabs/Module/Admin.php:141
+msgid "Registered accounts"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:436
-msgid "PHP register_argc_argv"
+#: ../../Zotlabs/Module/Admin.php:142
+msgid "Pending registrations"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:454
-#, 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."
+#: ../../Zotlabs/Module/Admin.php:143
+msgid "Registered channels"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:459
-msgid "You can adjust these settings in the server php.ini file."
+#: ../../Zotlabs/Module/Admin.php:144
+msgid "Active plugins"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:461
-msgid "PHP upload limits"
+#: ../../Zotlabs/Module/Admin.php:145
+msgid "Version"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:484
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../Zotlabs/Module/Admin.php:146
+msgid "Repository version (master)"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:485
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../Zotlabs/Module/Admin.php:147
+msgid "Repository version (dev)"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:488
-msgid "Generate encryption keys"
+#: ../../Zotlabs/Module/Import.php:64 ../../Zotlabs/Module/Import_items.php:48
+msgid "Nothing to import."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:505
-msgid "libCurl PHP module"
+#: ../../Zotlabs/Module/Import.php:79 ../../Zotlabs/Module/Import.php:95
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Unable to download data from old server"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:506
-msgid "GD graphics PHP module"
+#: ../../Zotlabs/Module/Import.php:102
+#: ../../Zotlabs/Module/Import_items.php:77
+msgid "Imported file is empty."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:507
-msgid "OpenSSL PHP module"
+#: ../../Zotlabs/Module/Import.php:121
+#: ../../Zotlabs/Module/Import_items.php:93
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:508
-msgid "PDO database PHP module"
+#: ../../Zotlabs/Module/Import.php:144
+#, php-format
+msgid "Your service plan only allows %d channels."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:509
-msgid "mb_string PHP module"
+#: ../../Zotlabs/Module/Import.php:158
+msgid "No channel. Import failed."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:510
-msgid "xml PHP module"
+#: ../../Zotlabs/Module/Import.php:466
+msgid "Import completed."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:511
-msgid "zip PHP module"
+#: ../../Zotlabs/Module/Import.php:494
+msgid "You must be logged in to use this feature."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:515 ../../Zotlabs/Module/Setup.php:517
-msgid "Apache mod_rewrite module"
+#: ../../Zotlabs/Module/Import.php:499
+msgid "Import Channel"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Import.php:500
msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+"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/Setup.php:521 ../../Zotlabs/Module/Setup.php:524
-msgid "exec"
+#: ../../Zotlabs/Module/Import.php:501
+#: ../../Zotlabs/Module/Import_items.php:127
+msgid "File to Upload"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:521
-msgid ""
-"Error: exec is required but is either not installed or has been disabled in "
-"php.ini"
+#: ../../Zotlabs/Module/Import.php:502
+msgid "Or provide the old server/hub details"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:527 ../../Zotlabs/Module/Setup.php:530
-msgid "shell_exec"
+#: ../../Zotlabs/Module/Import.php:503
+msgid "Your old identity address (xyz@example.com)"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:527
-msgid ""
-"Error: shell_exec is required but is either not installed or has been "
-"disabled in php.ini"
+#: ../../Zotlabs/Module/Import.php:504
+msgid "Your old login email address"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:535
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../Zotlabs/Module/Import.php:505
+msgid "Your old login password"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Zotlabs/Module/Import.php:506
msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:543
-msgid "Error: openssl PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:547
-msgid "Error: PDO database PHP module required but not installed."
+"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 "
+"able to post from either location, but only one can be marked as the primary "
+"location for files, photos, and media."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:551
-msgid "Error: mb_string PHP module required but not installed."
+#: ../../Zotlabs/Module/Import.php:507
+msgid "Make this hub my primary location"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:555
-msgid "Error: xml PHP module required for DAV but not installed."
+#: ../../Zotlabs/Module/Import.php:508
+msgid "Move this channel (disable all previous locations)"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:559
-msgid "Error: zip PHP module required but not installed."
+#: ../../Zotlabs/Module/Import.php:509
+msgid "Import a few months of posts if possible (limited by available memory"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Zotlabs/Module/Import.php:510
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."
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:578
-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."
+#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:579
-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."
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Block.php:43
+#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96
+#: ../../Zotlabs/Module/Wall_upload.php:31
+msgid "Channel not found."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:580
+#: ../../Zotlabs/Module/Page.php:131
msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"install/INSTALL.txt\" for instructions."
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
+"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:583
-msgid ".htconfig.php is writable"
+#: ../../Zotlabs/Module/Webpages.php:52
+msgid "Import Webpage Elements"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:597
-msgid ""
-"This software uses the Smarty3 template engine to render its web views. "
-"Smarty3 compiles templates to PHP to speed up rendering."
+#: ../../Zotlabs/Module/Webpages.php:53
+msgid "Import selected"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:598
-#, 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."
+#: ../../Zotlabs/Module/Webpages.php:76
+msgid "Export Webpage Elements"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:599 ../../Zotlabs/Module/Setup.php:620
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
+#: ../../Zotlabs/Module/Webpages.php:77
+msgid "Export selected"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:600
-#, 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."
+#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/conversation.php:1832
+msgid "Webpages"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:603
-#, php-format
-msgid "%s is writable"
+#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Module/Events.php:478
+#: ../../Zotlabs/Module/Photos.php:1063 ../../Zotlabs/Lib/ThreadItem.php:741
+#: ../../include/page_widgets.php:43 ../../include/conversation.php:1280
+msgid "Preview"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:619
-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"
+#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:44
+msgid "Actions"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:623
-msgid "store is writable"
+#: ../../Zotlabs/Module/Webpages.php:254 ../../include/page_widgets.php:45
+msgid "Page Link"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:655
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
+#: ../../Zotlabs/Module/Webpages.php:255
+msgid "Page Title"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:656
-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!"
+#: ../../Zotlabs/Module/Webpages.php:285
+msgid "Invalid file type."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:657
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
+#: ../../Zotlabs/Module/Webpages.php:297
+msgid "Error opening zip file"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:658
-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."
+#: ../../Zotlabs/Module/Webpages.php:308
+msgid "Invalid folder path."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:659
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
+#: ../../Zotlabs/Module/Webpages.php:335
+msgid "No webpage elements detected."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:660
-msgid ""
-"Providers are available that issue free certificates which are browser-valid."
+#: ../../Zotlabs/Module/Webpages.php:410
+msgid "Import complete."
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:662
-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. "
-"These are not normally required by browsers, but are required for server-to-"
-"server communications."
+#: ../../Zotlabs/Module/Ping.php:254
+msgid "sent you a private message"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:664
-msgid "SSL certificate validation"
+#: ../../Zotlabs/Module/Ping.php:302
+msgid "added your channel"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:670
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-"Test: "
+#: ../../Zotlabs/Module/Ping.php:312
+msgid "g A l F d"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:673
-msgid "Url rewrite is working"
+#: ../../Zotlabs/Module/Ping.php:330
+msgid "[today]"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:687
-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."
+#: ../../Zotlabs/Module/Ping.php:339
+msgid "posted an event"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:711 ../../addon/rendezvous/rendezvous.php:401
-#: ../../addon/cdav/cdav.php:41
-msgid "Errors encountered creating database tables."
+#: ../../Zotlabs/Module/Connections.php:52
+#: ../../Zotlabs/Module/Connections.php:157
+#: ../../Zotlabs/Module/Connections.php:246
+msgid "Blocked"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:751
-msgid "<h1>What next</h1>"
+#: ../../Zotlabs/Module/Connections.php:57
+#: ../../Zotlabs/Module/Connections.php:164
+#: ../../Zotlabs/Module/Connections.php:245
+msgid "Ignored"
msgstr ""
-#: ../../Zotlabs/Module/Setup.php:752
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../Zotlabs/Module/Connections.php:62
+#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Zotlabs/Module/Connections.php:244
+msgid "Hidden"
msgstr ""
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
+#: ../../Zotlabs/Module/Connections.php:67
+#: ../../Zotlabs/Module/Connections.php:171
+#: ../../Zotlabs/Module/Connections.php:243
+msgid "Archived"
msgstr ""
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
+#: ../../Zotlabs/Module/Connections.php:72
+#: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116
+#: ../../include/conversation.php:1657
+msgid "New"
msgstr ""
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
+#: ../../Zotlabs/Module/Connections.php:88
+#: ../../Zotlabs/Module/Connections.php:103
+#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30
+msgid "All"
msgstr ""
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
+#: ../../Zotlabs/Module/Connections.php:134
+msgid "New Connections"
msgstr ""
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
+#: ../../Zotlabs/Module/Connections.php:137
+msgid "Show pending (new) connections"
msgstr ""
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
+#: ../../Zotlabs/Module/Connections.php:141
+#: ../../Zotlabs/Module/Profperm.php:140
+msgid "All Connections"
msgstr ""
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided "
-"on this page."
+#: ../../Zotlabs/Module/Connections.php:144
+msgid "Show all connections"
msgstr ""
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
+#: ../../Zotlabs/Module/Connections.php:160
+msgid "Only show blocked connections"
msgstr ""
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
+#: ../../Zotlabs/Module/Connections.php:167
+msgid "Only show ignored connections"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Queue.php:35
-msgid "Queue Statistics"
+#: ../../Zotlabs/Module/Connections.php:174
+msgid "Only show archived connections"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Queue.php:36
-msgid "Total Entries"
+#: ../../Zotlabs/Module/Connections.php:181
+msgid "Only show hidden connections"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Queue.php:37
-msgid "Priority"
+#: ../../Zotlabs/Module/Connections.php:242
+msgid "Pending approval"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Queue.php:38
-msgid "Destination URL"
+#: ../../Zotlabs/Module/Connections.php:258
+#, php-format
+msgid "%1$s [%2$s]"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Queue.php:39
-msgid "Mark hub permanently offline"
+#: ../../Zotlabs/Module/Connections.php:259
+msgid "Edit connection"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Queue.php:40
-msgid "Empty queue for this hub"
+#: ../../Zotlabs/Module/Connections.php:260
+msgid "Delete connection"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Queue.php:41
-msgid "Last known contact"
+#: ../../Zotlabs/Module/Connections.php:269
+msgid "Channel address"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38
-msgid "Off"
+#: ../../Zotlabs/Module/Connections.php:271
+msgid "Network"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38
-msgid "On"
+#: ../../Zotlabs/Module/Connections.php:274
+msgid "Call"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#, php-format
-msgid "Lock feature %s"
+#: ../../Zotlabs/Module/Connections.php:276
+msgid "Status"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Features.php:64
-msgid "Manage Additional Features"
+#: ../../Zotlabs/Module/Connections.php:278
+msgid "Connected"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
-msgid "Update has been marked successful"
+#: ../../Zotlabs/Module/Connections.php:280
+msgid "Approve connection"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Dbsync.php:29
-#, php-format
-msgid "Executing %s failed. Check system logs."
+#: ../../Zotlabs/Module/Connections.php:281
+#: ../../Zotlabs/Module/Admin/Accounts.php:171
+msgid "Approve"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Dbsync.php:32
-#, php-format
-msgid "Update %s was successfully applied."
+#: ../../Zotlabs/Module/Connections.php:282
+msgid "Ignore connection"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Dbsync.php:36
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
+#: ../../Zotlabs/Module/Connections.php:283
+#: ../../Zotlabs/Module/Connedit.php:626
+msgid "Ignore"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Dbsync.php:39
-#, php-format
-msgid "Update function %s could not be found."
+#: ../../Zotlabs/Module/Connections.php:284
+msgid "Recent activity"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Dbsync.php:55
-msgid "No failed updates."
+#: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216
+#: ../../include/text.php:957 ../../include/nav.php:181
+msgid "Connections"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
-msgid "Failed Updates"
+#: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Module/Search.php:44
+#: ../../Zotlabs/Lib/Apps.php:237 ../../Zotlabs/Widget/Sitesearch.php:31
+#: ../../include/text.php:1027 ../../include/text.php:1039
+#: ../../include/nav.php:160 ../../include/acl_selectors.php:213
+msgid "Search"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Dbsync.php:61
-msgid "Mark success (if update was manually applied)"
+#: ../../Zotlabs/Module/Connections.php:313
+msgid "Search your connections"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Dbsync.php:62
-msgid "Attempt to execute this update step automatically"
+#: ../../Zotlabs/Module/Connections.php:314
+msgid "Connections search"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Cover_photo.php:56
+#: ../../Zotlabs/Module/Profile_photo.php:61
+msgid "Image uploaded but image cropping failed."
+=======
#: ../../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:3416
+#: ../../include/items.php:3391
msgid "Item not found."
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:289
-#, php-format
-msgid "Plugin %s disabled."
+#: ../../Zotlabs/Module/Cover_photo.php:136
+#: ../../Zotlabs/Module/Cover_photo.php:186
+msgid "Cover Photos"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:294
-#, php-format
-msgid "Plugin %s enabled."
+#: ../../Zotlabs/Module/Cover_photo.php:159
+#: ../../Zotlabs/Module/Profile_photo.php:137
+msgid "Image resize failed."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:310
-#: ../../Zotlabs/Module/Admin/Themes.php:95
-msgid "Disable"
+#: ../../Zotlabs/Module/Cover_photo.php:173
+#: ../../Zotlabs/Module/Profile_photo.php:203 ../../include/photos.php:145
+msgid "Unable to process image"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:313
-#: ../../Zotlabs/Module/Admin/Themes.php:97
-msgid "Enable"
+#: ../../Zotlabs/Module/Cover_photo.php:197
+#: ../../Zotlabs/Module/Profile_photo.php:238
+msgid "Image upload failed."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:341
-#: ../../Zotlabs/Module/Admin/Plugins.php:436
-#: ../../Zotlabs/Module/Admin/Accounts.php:164
-#: ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Themes.php:122
-#: ../../Zotlabs/Module/Admin/Themes.php:156
-#: ../../Zotlabs/Module/Admin/Site.php:277
-#: ../../Zotlabs/Module/Admin/Security.php:86
-#: ../../Zotlabs/Module/Admin.php:137
-msgid "Administration"
+#: ../../Zotlabs/Module/Cover_photo.php:214
+#: ../../Zotlabs/Module/Profile_photo.php:257
+msgid "Unable to process image."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:342
-#: ../../Zotlabs/Module/Admin/Plugins.php:437 ../../Zotlabs/Widget/Admin.php:27
-msgid "Plugins"
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4224
+msgid "female"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:343
-#: ../../Zotlabs/Module/Admin/Themes.php:124
-msgid "Toggle"
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4225
+#, php-format
+msgid "%1$s updated her %2$s"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4226
+msgid "male"
+=======
#: ../../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
msgid "Settings"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:351
-#: ../../Zotlabs/Module/Admin/Themes.php:134
-msgid "Author: "
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4227
+#, php-format
+msgid "%1$s updated his %2$s"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:352
-#: ../../Zotlabs/Module/Admin/Themes.php:135
-msgid "Maintainer: "
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4229
+#, php-format
+msgid "%1$s updated their %2$s"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:353
-msgid "Minimum project version: "
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1738
+msgid "cover photo"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:354
-msgid "Maximum project version: "
+#: ../../Zotlabs/Module/Cover_photo.php:307
+#: ../../Zotlabs/Module/Cover_photo.php:322
+#: ../../Zotlabs/Module/Profile_photo.php:318
+#: ../../Zotlabs/Module/Profile_photo.php:365
+msgid "Photo not available."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:355
-msgid "Minimum PHP version: "
+#: ../../Zotlabs/Module/Cover_photo.php:358
+#: ../../Zotlabs/Module/Profile_photo.php:420
+msgid "Upload File:"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:356
-msgid "Compatible Server Roles: "
+#: ../../Zotlabs/Module/Cover_photo.php:359
+#: ../../Zotlabs/Module/Profile_photo.php:421
+msgid "Select a profile:"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:357
-msgid "Requires: "
+#: ../../Zotlabs/Module/Cover_photo.php:360
+msgid "Upload Cover Photo"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:358
-#: ../../Zotlabs/Module/Admin/Plugins.php:442
-msgid "Disabled - version incompatibility"
+#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:429
+#: ../../Zotlabs/Module/Settings/Channel.php:404
+msgid "or"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:411
-msgid "Enter the public git repository URL of the plugin repo."
+#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:429
+msgid "skip this step"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:412
-msgid "Plugin repo git URL"
+#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:429
+msgid "select a photo from your photo albums"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
-msgid "Custom repo name"
+#: ../../Zotlabs/Module/Cover_photo.php:381
+#: ../../Zotlabs/Module/Profile_photo.php:448
+msgid "Crop Image"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
-msgid "(optional)"
+#: ../../Zotlabs/Module/Cover_photo.php:382
+#: ../../Zotlabs/Module/Profile_photo.php:449
+msgid "Please adjust the image cropping for optimum viewing."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:414
-msgid "Download Plugin Repo"
+#: ../../Zotlabs/Module/Cover_photo.php:384
+#: ../../Zotlabs/Module/Profile_photo.php:451
+msgid "Done Editing"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:421
-msgid "Install new repo"
+#: ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Settings/Features.php:38
+msgid "Off"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Settings/Features.php:38
+msgid "On"
msgstr ""
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#, php-format
+msgid "Lock feature %s"
+=======
#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:358
msgid "Install"
msgstr ""
@@ -2093,46 +2554,325 @@ msgstr ""
#: ../../Zotlabs/Module/Admin/Plugins.php:423
#: ../../Zotlabs/Module/Settings/Oauth.php:88
#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Wiki.php:288 ../../Zotlabs/Module/Wiki.php:314
+#: ../../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:1325
-#: ../../include/conversation.php:1374
+#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1327
+#: ../../include/conversation.php:1376
msgid "Cancel"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:445
-msgid "Manage Repos"
+#: ../../Zotlabs/Module/Admin/Features.php:64
+msgid "Manage Additional Features"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:446
-msgid "Installed Plugin Repositories"
+#: ../../Zotlabs/Module/Admin/Logs.php:28
+msgid "Log settings updated."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:447
-msgid "Install a New Plugin Repository"
+#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48
+#: ../../Zotlabs/Widget/Admin.php:58
+msgid "Logs"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Admin/Logs.php:85
+msgid "Clear"
+=======
#: ../../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"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:454
-msgid "Switch branch"
+#: ../../Zotlabs/Module/Admin/Logs.php:91
+msgid "Debugging"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Plugins.php:455
-#: ../../Zotlabs/Module/Photos.php:960 ../../Zotlabs/Module/Tagrm.php:137
-#: ../../addon/superblock/superblock.php:116
-msgid "Remove"
+#: ../../Zotlabs/Module/Admin/Logs.php:92
+msgid "Log file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Logs.php:92
+msgid ""
+"Must be writable by web server. Relative to your top-level webserver "
+"directory."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Logs.php:93
+msgid "Log level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:69
+msgid "New Profile Field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:70
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+msgid "Field nickname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:70
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+msgid "System name of field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:71
+#: ../../Zotlabs/Module/Admin/Profs.php:91
+msgid "Input type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:72
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+msgid "Field Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:72
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+msgid "Label on profile pages"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Admin/Profs.php:73
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+msgid "Help text"
+=======
+#: ../../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"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:73
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+msgid "Additional info (optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:74
+#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Filer.php:53
+#: ../../Zotlabs/Module/Rbmark.php:32 ../../Zotlabs/Module/Rbmark.php:104
+#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1028
+#: ../../include/text.php:1040
+msgid "Save"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:83
+msgid "Field definition not found"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Admin/Profs.php:89
+msgid "Edit Profile Field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30
+msgid "Profile Fields"
+=======
+#: ../../Zotlabs/Module/Admin/Accounts.php:174
+#: ../../Zotlabs/Module/Connedit.php:618
+msgid "Block"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:175
+#: ../../Zotlabs/Module/Connedit.php:618
+msgid "Unblock"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:148
+msgid "Basic Profile Fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:149
+msgid "Advanced Profile Fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:149
+msgid "(In addition to basic fields)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:151
+msgid "All available fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:152
+msgid "Custom Fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:156
+msgid "Create Custom Field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:77
+msgid ""
+"By default, unfiltered HTML is allowed in embedded media. This is inherently "
+"insecure."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:80
+msgid ""
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:81
+msgid ""
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
+"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:82
+msgid ""
+"All other embedded content will be filtered, <strong>unless</strong> "
+"embedded content from that site is explicitly blocked."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:87
+#: ../../Zotlabs/Widget/Admin.php:25
+msgid "Security"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:89
+msgid "Block public"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:89
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently authenticated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:90
+msgid "Set \"Transport Security\" HTTP header"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:91
+msgid "Set \"Content Security Policy\" HTTP header"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:92
+msgid "Allowed email domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:92
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:93
+msgid "Not allowed email domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:93
+msgid ""
+"Comma separated list of domains which are not allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains, unless allowed domains have been defined."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:94
+msgid "Allow communications only from these sites"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:94
+msgid ""
+"One site per line. Leave empty to allow communication from anywhere by "
+"default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:95
+msgid "Block communications from these sites"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:96
+msgid "Allow communications only from these channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:96
+msgid ""
+"One channel (hash) per line. Leave empty to allow from any channel by default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:97
+msgid "Block communications from these channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:98
+msgid "Only allow embeds from secure (SSL) websites and links."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:99
+msgid "Allow unfiltered embedded HTML content only from these domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:99
+msgid "One site per line. By default embedded content is filtered."
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Admin/Security.php:100
+msgid "Block embedded HTML from these domains"
+=======
+#: ../../Zotlabs/Module/Admin/Channels.php:154
+#: ../../include/conversation.php:1760 ../../include/nav.php:369
+msgid "Channel"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#, php-format
+msgid "Password changed for account %d."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:46
+msgid "Account settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:61
+msgid "Account not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+msgid "Account Edit"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:69
+msgid "New Password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+msgid "New Password again"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:71
+msgid "Technical skill level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:72
+msgid "Account language (for emails)"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Admin/Account_edit.php:73
+msgid "Service class"
+=======
+#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2915
+msgid "Default"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
#: ../../Zotlabs/Module/Admin/Accounts.php:36
@@ -2187,24 +2927,10 @@ 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 ../../include/conversation.php:686
-msgid "Approve"
-msgstr ""
-
#: ../../Zotlabs/Module/Admin/Accounts.php:172
msgid "Deny"
msgstr ""
@@ -2255,37 +2981,6 @@ msgid ""
"this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Logs.php:28
-msgid "Log settings updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48
-#: ../../Zotlabs/Widget/Admin.php:58
-msgid "Logs"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:85
-msgid "Clear"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:91
-msgid "Debugging"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid "Log file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid ""
-"Must be writable by web server. Relative to your top-level webserver "
-"directory."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:93
-msgid "Log level"
-msgstr ""
-
#: ../../Zotlabs/Module/Admin/Channels.php:31
#, php-format
msgid "%s channel censored/uncensored"
@@ -2358,7 +3053,7 @@ msgid "Disallow Code"
msgstr ""
#: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1758 ../../include/nav.php:362
+#: ../../include/conversation.php:1751
msgid "Channel"
msgstr ""
@@ -2378,6 +3073,196 @@ msgid ""
"channel on this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
+#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+msgid "Update has been marked successful"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:29
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:32
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:36
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:39
+#, php-format
+msgid "Update function %s could not be found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:55
+msgid "No failed updates."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+msgid "Failed Updates"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:61
+msgid "Mark success (if update was manually applied)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:62
+msgid "Attempt to execute this update step automatically"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:35
+msgid "Queue Statistics"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:36
+msgid "Total Entries"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:37
+msgid "Priority"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:38
+msgid "Destination URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:39
+msgid "Mark hub permanently offline"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:40
+msgid "Empty queue for this hub"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:41
+msgid "Last known contact"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:289
+#, php-format
+msgid "Plugin %s disabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:294
+#, php-format
+msgid "Plugin %s enabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:310
+#: ../../Zotlabs/Module/Admin/Themes.php:95
+msgid "Disable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:313
+#: ../../Zotlabs/Module/Admin/Themes.php:97
+msgid "Enable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:342
+#: ../../Zotlabs/Module/Admin/Plugins.php:437
+#: ../../Zotlabs/Widget/Admin.php:27
+msgid "Plugins"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:343
+#: ../../Zotlabs/Module/Admin/Themes.php:124
+msgid "Toggle"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:344
+#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223
+#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:203
+msgid "Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:351
+#: ../../Zotlabs/Module/Admin/Themes.php:134
+msgid "Author: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:352
+#: ../../Zotlabs/Module/Admin/Themes.php:135
+msgid "Maintainer: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:353
+msgid "Minimum project version: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:354
+msgid "Maximum project version: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:355
+msgid "Minimum PHP version: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:356
+msgid "Compatible Server Roles: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:357
+msgid "Requires: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:358
+#: ../../Zotlabs/Module/Admin/Plugins.php:442
+msgid "Disabled - version incompatibility"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:411
+msgid "Enter the public git repository URL of the plugin repo."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:412
+msgid "Plugin repo git URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:413
+msgid "Custom repo name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:413
+msgid "(optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:414
+msgid "Download Plugin Repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:421
+msgid "Install new repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:358
+msgid "Install"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:445
+msgid "Manage Repos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:446
+msgid "Installed Plugin Repositories"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:447
+msgid "Install a New Plugin Repository"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:454
+msgid "Switch branch"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:455
+#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Photos.php:960
+#: ../../extend/addon/addon/superblock/superblock.php:116
+msgid "Remove"
+msgstr ""
+
#: ../../Zotlabs/Module/Admin/Themes.php:26
msgid "Theme settings updated."
msgstr ""
@@ -2407,8 +3292,7 @@ msgstr ""
msgid "Site settings updated."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:170
-#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:2928
+#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2942
msgid "Default"
msgstr ""
@@ -2451,27 +3335,39 @@ msgstr ""
msgid "My site offers free accounts with optional paid upgrades"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:264
+#: ../../Zotlabs/Module/Admin/Site.php:258
+msgid "Basic/Minimal Social Networking"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:259
+msgid "Standard Configuration (default)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:260
+msgid "Professional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:264 ../../Zotlabs/Lib/Techlevels.php:10
msgid "Beginner/Basic"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:265
+#: ../../Zotlabs/Module/Admin/Site.php:265 ../../Zotlabs/Lib/Techlevels.php:11
msgid "Novice - not skilled but willing to learn"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:266
+#: ../../Zotlabs/Module/Admin/Site.php:266 ../../Zotlabs/Lib/Techlevels.php:12
msgid "Intermediate - somewhat comfortable"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:267
+#: ../../Zotlabs/Module/Admin/Site.php:267 ../../Zotlabs/Lib/Techlevels.php:13
msgid "Advanced - very comfortable"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:268
+#: ../../Zotlabs/Module/Admin/Site.php:268 ../../Zotlabs/Lib/Techlevels.php:14
msgid "Expert - I can write computer code"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:269
+#: ../../Zotlabs/Module/Admin/Site.php:269 ../../Zotlabs/Lib/Techlevels.php:15
msgid "Wizard - I probably know more than you do"
msgstr ""
@@ -2479,11 +3375,6 @@ msgstr ""
msgid "Site"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:280
-#: ../../Zotlabs/Module/Register.php:253
-msgid "Registration"
-msgstr ""
-
#: ../../Zotlabs/Module/Admin/Site.php:281
msgid "File upload"
msgstr ""
@@ -2492,21 +3383,65 @@ msgstr ""
msgid "Policies"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:283 ../../include/contact_widgets.php:16
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Admin/Site.php:283
+#: ../../include/contact_widgets.php:16
msgid "Advanced"
msgstr ""
#: ../../Zotlabs/Module/Admin/Site.php:287
-#: ../../addon/statusnet/statusnet.php:890
+#: ../../extend/addon/addon/statusnet/statusnet.php:890
msgid "Site name"
msgstr ""
+#: ../../Zotlabs/Module/Admin/Site.php:289
+msgid "Server Configuration/Role"
+msgstr ""
+
#: ../../Zotlabs/Module/Admin/Site.php:291
msgid "Site default technical skill level"
msgstr ""
#: ../../Zotlabs/Module/Admin/Site.php:291
msgid "Used to provide a member experience matched to technical comfort level"
+=======
+#: ../../Zotlabs/Module/Settings/Permcats.php:103
+#: ../../Zotlabs/Module/Settings/Tokens.php:161
+#: ../../Zotlabs/Module/Connedit.php:886
+msgid "My Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Permcats.php:105
+#: ../../Zotlabs/Module/Settings/Tokens.php:163
+#: ../../Zotlabs/Module/Connedit.php:881
+msgid "inherited"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Permcats.php:108
+#: ../../Zotlabs/Module/Settings/Tokens.php:166
+#: ../../Zotlabs/Module/Connedit.php:888
+msgid "Individual Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Permcats.php:109
+#: ../../Zotlabs/Module/Settings/Tokens.php:167
+#: ../../Zotlabs/Module/Connedit.php:889
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can <strong>not</strong> change those settings here."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:62
+#: ../../Zotlabs/Module/Settings/Channel.php:66
+#: ../../Zotlabs/Module/Settings/Channel.php:67
+#: ../../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
+msgid "Friends"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
#: ../../Zotlabs/Module/Admin/Site.php:293
@@ -2531,7 +3466,8 @@ msgid ""
"BBCode can be used here"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Site.php:297 ../../Zotlabs/Module/Siteinfo.php:23
+#: ../../Zotlabs/Module/Admin/Site.php:297
+#: ../../Zotlabs/Module/Siteinfo.php:23
msgid "Site Information"
msgstr ""
@@ -2581,8 +3517,13 @@ msgid ""
"limits."
msgstr ""
+<<<<<<< HEAD
#: ../../Zotlabs/Module/Admin/Site.php:304
msgid "Does this site allow new member registration?"
+=======
+#: ../../Zotlabs/Module/Settings/Channel.php:482 ../../include/channel.php:1250
+msgid "Full Name:"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
#: ../../Zotlabs/Module/Admin/Site.php:305
@@ -2779,1195 +3720,730 @@ msgstr ""
msgid "0 for no expiration of imported content"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Profs.php:69
-msgid "New Profile Field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:70
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-msgid "Field nickname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:70
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-msgid "System name of field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:71
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-msgid "Input type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:72
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-msgid "Field Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:72
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-msgid "Label on profile pages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:73
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-msgid "Help text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:73
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-msgid "Additional info (optional)"
-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
-msgid "Save"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:83
-msgid "Field definition not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:89
-msgid "Edit Profile Field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30
-msgid "Profile Fields"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:148
-msgid "Basic Profile Fields"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:149
-msgid "Advanced Profile Fields"
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Enter a folder name"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Profs.php:149
-msgid "(In addition to basic fields)"
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "or select an existing folder (doubleclick)"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Profs.php:151
-msgid "All available fields"
+#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:137
+msgid "Save to Folder"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Profs.php:152
-msgid "Custom Fields"
+#: ../../Zotlabs/Module/Editlayout.php:79
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editblock.php:79
+#: ../../Zotlabs/Module/Editblock.php:95
+msgid "Item not found"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Profs.php:156
-msgid "Create Custom Field"
+#: ../../Zotlabs/Module/Editlayout.php:137
+msgid "Edit Layout"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Account_edit.php:29
-#, php-format
-msgid "Password changed for account %d."
+#: ../../Zotlabs/Module/Editwebpage.php:144
+msgid "Page link"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Account_edit.php:46
-msgid "Account settings updated."
+#: ../../Zotlabs/Module/Editwebpage.php:148
+#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Mail.php:287
+#: ../../Zotlabs/Module/Mail.php:424 ../../Zotlabs/Module/Chat.php:205
+#: ../../include/conversation.php:1228
+msgid "Insert web link"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Account_edit.php:61
-msgid "Account not found."
+#: ../../Zotlabs/Module/Editwebpage.php:171
+msgid "Edit Webpage"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
-msgid "Account Edit"
+#: ../../Zotlabs/Module/Chatsvc.php:131
+msgid "Away"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
-msgid "New Password"
+#: ../../Zotlabs/Module/Chatsvc.php:136
+msgid "Online"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
-msgid "New Password again"
+#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
+msgid "This site is not a directory server"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Account_edit.php:71
-msgid "Technical skill level"
+#: ../../Zotlabs/Module/Dirsearch.php:33
+msgid "This directory server requires an access token"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
-msgid "Account language (for emails)"
+#: ../../Zotlabs/Module/Network.php:96
+msgid "No such group"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Account_edit.php:73
-msgid "Service class"
+#: ../../Zotlabs/Module/Network.php:136
+msgid "No such channel"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:77
-msgid ""
-"By default, unfiltered HTML is allowed in embedded media. This is inherently "
-"insecure."
+#: ../../Zotlabs/Module/Network.php:141
+msgid "forum"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:80
-msgid ""
-"The recommended setting is to only allow unfiltered HTML from the following "
-"sites:"
+#: ../../Zotlabs/Module/Network.php:153
+msgid "Search Results For:"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:81
-msgid ""
-"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
-"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+#: ../../Zotlabs/Module/Network.php:221
+msgid "Privacy group is empty"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:82
-msgid ""
-"All other embedded content will be filtered, <strong>unless</strong> "
-"embedded content from that site is explicitly blocked."
+#: ../../Zotlabs/Module/Network.php:230
+msgid "Privacy group: "
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:87 ../../Zotlabs/Widget/Admin.php:25
-msgid "Security"
+#: ../../Zotlabs/Module/Network.php:256
+msgid "Invalid connection."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:89
-msgid "Block public"
+#: ../../Zotlabs/Module/Network.php:275
+#: ../../extend/addon/addon/redred/redred.php:65
+msgid "Invalid channel."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:89
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently authenticated."
+#: ../../Zotlabs/Module/Menu.php:49
+msgid "Unable to update menu."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:90
-msgid "Set \"Transport Security\" HTTP header"
+#: ../../Zotlabs/Module/Menu.php:60
+msgid "Unable to create menu."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:91
-msgid "Set \"Content Security Policy\" HTTP header"
+#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+msgid "Menu Name"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:92
-msgid "Allowed email domains"
+#: ../../Zotlabs/Module/Menu.php:98
+msgid "Unique name (not visible on webpage) - required"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:92
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
+#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+msgid "Menu Title"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:93
-msgid "Not allowed email domains"
+#: ../../Zotlabs/Module/Menu.php:99
+msgid "Visible on webpage - leave empty for no title"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:93
-msgid ""
-"Comma separated list of domains which are not allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains, unless allowed domains have been defined."
+#: ../../Zotlabs/Module/Menu.php:100
+msgid "Allow Bookmarks"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:94
-msgid "Allow communications only from these sites"
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+msgid "Menu may be used to store saved bookmarks"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:94
-msgid ""
-"One site per line. Leave empty to allow communication from anywhere by "
-"default"
+#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+msgid "Submit and proceed"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:95
-msgid "Block communications from these sites"
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2295
+msgid "Menus"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:96
-msgid "Allow communications only from these channels"
+#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120
+msgid "Drop"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:96
-msgid ""
-"One channel (hash) per line. Leave empty to allow from any channel by default"
+#: ../../Zotlabs/Module/Menu.php:117
+msgid "Bookmarks allowed"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:97
-msgid "Block communications from these channels"
+#: ../../Zotlabs/Module/Menu.php:119
+msgid "Delete this menu"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:98
-msgid "Only allow embeds from secure (SSL) websites and links."
+#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+msgid "Edit menu contents"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:99
-msgid "Allow unfiltered embedded HTML content only from these domains"
+#: ../../Zotlabs/Module/Menu.php:121
+msgid "Edit this menu"
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:99
-msgid "One site per line. By default embedded content is filtered."
+#: ../../Zotlabs/Module/Menu.php:136
+msgid "Menu could not be deleted."
msgstr ""
-#: ../../Zotlabs/Module/Admin/Security.php:100
-msgid "Block embedded HTML from these domains"
+#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
+msgid "Menu not found."
msgstr ""
-#: ../../Zotlabs/Module/Lockview.php:75
-msgid "Remote privacy information not available."
+#: ../../Zotlabs/Module/Menu.php:149
+msgid "Edit Menu"
msgstr ""
-#: ../../Zotlabs/Module/Lockview.php:96
-msgid "Visible to:"
+#: ../../Zotlabs/Module/Menu.php:153
+msgid "Add or remove entries to this menu"
msgstr ""
-#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
-#: ../../Zotlabs/Module/Acl.php:117 ../../include/acl_selectors.php:183
-msgctxt "acl"
-msgid "Profile"
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Menu name"
msgstr ""
-#: ../../Zotlabs/Module/Moderate.php:39
-msgid "Comment approved"
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Must be unique, only seen by you"
msgstr ""
-#: ../../Zotlabs/Module/Moderate.php:43
-msgid "Comment deleted"
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Permcats.php:37
-msgid "Permission category saved."
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title as seen by others"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Permcats.php:61
-msgid ""
-"Use this form to create permission rules for various classes of people or "
-"connections."
+#: ../../Zotlabs/Module/Menu.php:157
+msgid "Allow bookmarks"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Permcats.php:94
-msgid "Permission Categories"
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
+#: ../../Zotlabs/Module/Xchan.php:41
+msgid "Not found."
+=======
+#: ../../Zotlabs/Module/Settings/Tokens.php:160
+#: ../../Zotlabs/Module/Connedit.php:885
+msgid "Their Settings"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Settings/Permcats.php:102
-msgid "Permission Name"
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Permcats.php:103
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Connedit.php:886
-msgid "My Settings"
+#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:138
+msgid "Edit post"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Permcats.php:105
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Connedit.php:881
-msgid "inherited"
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Permcats.php:108
-#: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Connedit.php:888
-msgid "Individual Permissions"
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Permcats.php:109
-#: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Connedit.php:889
+#: ../../Zotlabs/Module/Locs.php:66
msgid ""
-"Some permissions may be inherited from your channel's <a href=\"settings"
-"\"><strong>privacy settings</strong></a>, which have higher priority than "
-"individual settings. You can <strong>not</strong> change those settings here."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:62
-#: ../../Zotlabs/Module/Settings/Channel.php:66
-#: ../../Zotlabs/Module/Settings/Channel.php:67
-#: ../../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:407
-#: ../../include/channel.php:408 ../../include/channel.php:415
-msgid "Friends"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:251
-#: ../../addon/rendezvous/rendezvous.php:82
-#: ../../addon/openstreetmap/openstreetmap.php:184
-#: ../../addon/msgfooter/msgfooter.php:54 ../../addon/logrot/logrot.php:54
-#: ../../addon/twitter/twitter.php:766 ../../addon/piwik/piwik.php:116
-#: ../../addon/xmpp/xmpp.php:102
-msgid "Settings updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:312
-msgid "Nobody except yourself"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:313
-msgid "Only those you specifically allow"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:314
-msgid "Approved connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:315
-msgid "Any connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:316
-msgid "Anybody on this website"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:317
-msgid "Anybody in this network"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:318
-msgid "Anybody authenticated"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:319
-msgid "Anybody on the internet"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:395
-msgid "Publish your default profile in the network directory"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:400
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:404
-#: ../../Zotlabs/Module/Profile_photo.php:429
-#: ../../Zotlabs/Module/Cover_photo.php:365
-msgid "or"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:409
-msgid "Your channel address is"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:412
-msgid "Your files/photos are accessible via WebDAV at"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:474
-msgid "Channel Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:481
-msgid "Basic Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:482 ../../include/channel.php:1264
-msgid "Full Name:"
+"Please select another location to become primary before removing the primary "
+"location."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:483
-#: ../../Zotlabs/Module/Settings/Account.php:119
-msgid "Email Address:"
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:484
-msgid "Your Timezone:"
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:485
-msgid "Default Post Location:"
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:485
-msgid "Geographical location to display on your posts"
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:486
-msgid "Use Browser Location:"
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:488
-msgid "Adult Content"
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:488
+#: ../../Zotlabs/Module/Locs.php:124
msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:490
-msgid "Security and Privacy Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:493
-msgid "Your permissions are already configured. Click to view/adjust"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:495
-msgid "Hide my online presence"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Channel.php:495
-msgid "Prevents displaying in your profile that you are online"
+"When possible, drop a location by logging into that website/hub and removing "
+"your channel."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:497
-msgid "Simple Privacy Settings:"
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:498
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
+#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12
+msgid "Public Hubs"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:499
+#: ../../Zotlabs/Module/Pubsites.php:27
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
-msgid "Private - <em>default private, never open or public</em>"
+"The listed hubs allow public registration for the $Projectname network. All "
+"hubs in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some hubs may require subscription or "
+"provide tiered service plans. The hub itself <strong>may</strong> provide "
+"additional details."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:501
-msgid "Blocked - <em>default blocked to/from everybody</em>"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Hub URL"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:503
-msgid "Allow others to tag your posts"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Access Type"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:503
-msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Registration Policy"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:505
-msgid "Channel Permission Limits"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Stats"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid "Expire other channel content after this many days"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Software"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid "0 or blank to use the website limit."
+#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
+#: ../../include/conversation.php:1032
+msgid "Ratings"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-#, php-format
-msgid "This website expires after %d days."
+#: ../../Zotlabs/Module/Pubsites.php:48
+msgid "Rate"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid "This website does not expire imported content."
+#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25
+#: ../../extend/addon/addon/chess/chess.php:403
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:28
+msgid "You must be logged in to see this page."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:507
-msgid "The website limit takes precedence if lower than your limit."
+#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Profile.php:43
+#: ../../Zotlabs/Module/Hcard.php:35
+msgid "Posts and comments"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:508
-msgid "Maximum Friend Requests/Day:"
+#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Profile.php:50
+#: ../../Zotlabs/Module/Hcard.php:42
+msgid "Only posts"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:508
-msgid "May reduce spam activity"
+#: ../../Zotlabs/Module/Channel.php:112
+msgid "Insufficient permissions. Request redirected to profile page."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:509
-msgid "Default Access Control List (ACL)"
+#: ../../Zotlabs/Module/Apps.php:45
+msgid "Apps"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:511
-msgid "Use my default audience setting for the type of object published"
+#: ../../Zotlabs/Module/Apps.php:48
+msgid "Manage apps"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:518
-msgid "Channel permissions category:"
+#: ../../Zotlabs/Module/Apps.php:49
+msgid "Create new app"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:519
-msgid "Default Permissions Group"
+#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+#: ../../extend/addon/addon/opensearch/opensearch.php:42
+msgid "$Projectname"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "Maximum private messages per day from unknown people:"
+#: ../../Zotlabs/Module/Home.php:92
+#, php-format
+msgid "Welcome to %s"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:525
-msgid "Useful to reduce spamming"
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:528
-msgid "Notification Settings"
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:529
-msgid "By default post a status message when:"
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:530
-msgid "accepting a friend request"
+#: ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Thing.php:313
+#: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Photos.php:647
+#: ../../Zotlabs/Module/Photos.php:1011 ../../Zotlabs/Module/Chat.php:233
+#: ../../include/acl_selectors.php:218
+msgid "Permissions"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:531
-msgid "joining a forum/community"
+#: ../../Zotlabs/Module/Filestorage.php:159
+msgid "Set/edit permissions"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:532
-msgid "making an <em>interesting</em> profile change"
+#: ../../Zotlabs/Module/Filestorage.php:160
+msgid "Include all files and sub folders"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:533
-msgid "Send a notification email when:"
+#: ../../Zotlabs/Module/Filestorage.php:161
+msgid "Return to file list"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:534
-msgid "You receive a connection request"
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Copy/paste this code to attach file to a post"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:535
-msgid "Your connections are confirmed"
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Copy/paste this URL to link file from a web page"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:536
-msgid "Someone writes on your profile wall"
+#: ../../Zotlabs/Module/Filestorage.php:166
+msgid "Share this file"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:537
-msgid "Someone writes a followup comment"
+#: ../../Zotlabs/Module/Filestorage.php:167
+msgid "Show URL to this file"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:538
-msgid "You receive a private message"
+#: ../../Zotlabs/Module/Filestorage.php:168
+msgid "Notify your contacts about this file"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:539
-msgid "You receive a friend suggestion"
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
+#: ../../include/conversation.php:1774
+msgid "Photos"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:540
-msgid "You are tagged in a post"
+#: ../../Zotlabs/Module/Acl.php:117 ../../Zotlabs/Module/Lockview.php:117
+#: ../../Zotlabs/Module/Lockview.php:153 ../../include/acl_selectors.php:183
+msgctxt "acl"
+msgid "Profile"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:541
-msgid "You are poked/prodded/etc. in a post"
+#: ../../Zotlabs/Module/Acl.php:344
+msgid "network"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:543
-msgid "Someone likes your post/comment"
+#: ../../Zotlabs/Module/Acl.php:354
+msgid "RSS"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:546
-msgid "Show visual notifications including:"
+#: ../../Zotlabs/Module/Group.php:24
+msgid "Privacy group created."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:548
-msgid "Unseen grid activity"
+#: ../../Zotlabs/Module/Group.php:30
+msgid "Could not create privacy group."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:549
-msgid "Unseen channel activity"
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
+#: ../../include/items.php:3847
+msgid "Privacy group not found."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:550
-msgid "Unseen private messages"
+#: ../../Zotlabs/Module/Group.php:58
+msgid "Privacy group updated."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:550
-#: ../../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"
+#: ../../Zotlabs/Module/Group.php:90
+msgid "Create a group of channels."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:551
-msgid "Upcoming events"
+#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+msgid "Privacy group name: "
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:552
-msgid "Events today"
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+msgid "Members are visible to other channels"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:553
-msgid "Upcoming birthdays"
+#: ../../Zotlabs/Module/Group.php:111
+msgid "Privacy group removed."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:553
-msgid "Not available in all themes"
+#: ../../Zotlabs/Module/Group.php:113
+msgid "Unable to remove privacy group."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:554
-msgid "System (personal) notifications"
+#: ../../Zotlabs/Module/Group.php:183
+msgid "Privacy group editor"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:555
-msgid "System info messages"
+#: ../../Zotlabs/Module/Group.php:199
+msgid "All Connected Channels"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:556
-msgid "System critical alerts"
+#: ../../Zotlabs/Module/Group.php:231
+msgid "Click on a channel to add or remove."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:557
-msgid "New connections"
+#: ../../Zotlabs/Module/Dreport.php:45
+msgid "Invalid message"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:558
-msgid "System Registrations"
+#: ../../Zotlabs/Module/Dreport.php:78
+msgid "no results"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:559
-msgid ""
-"Also show new wall posts, private messages and connections under Notices"
+#: ../../Zotlabs/Module/Dreport.php:93
+msgid "channel sync processed"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:561
-msgid "Notify me of events this many days in advance"
+#: ../../Zotlabs/Module/Dreport.php:97
+msgid "queued"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:561
-msgid "Must be greater than 0"
+#: ../../Zotlabs/Module/Dreport.php:101
+msgid "posted"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:567
-msgid "Advanced Account/Page Type Settings"
+#: ../../Zotlabs/Module/Dreport.php:105
+msgid "accepted for delivery"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:568
-msgid "Change the behaviour of this account for special situations"
+#: ../../Zotlabs/Module/Dreport.php:109
+msgid "updated"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:570
-msgid "Miscellaneous Settings"
+#: ../../Zotlabs/Module/Dreport.php:112
+msgid "update ignored"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:571
-msgid "Default photo upload folder"
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Dreport.php:115
+msgid "permission denied"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:571
-#: ../../Zotlabs/Module/Settings/Channel.php:572
-msgid "%Y - current year, %m - current month"
+#: ../../Zotlabs/Module/Dreport.php:119
+msgid "recipient not found"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:572
-msgid "Default file upload folder"
+#: ../../Zotlabs/Module/Dreport.php:122
+msgid "mail recalled"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:574
-msgid "Personal menu to display in your channel pages"
+#: ../../Zotlabs/Module/Dreport.php:125
+msgid "duplicate mail received"
+=======
+#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:751
+#: ../../Zotlabs/Module/Photos.php:1290 ../../Zotlabs/Widget/Album.php:78
+msgid "View Photo"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:576
-msgid "Remove this channel."
+#: ../../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/Settings/Channel.php:577
-msgid "Firefox Share $Projectname provider"
+#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:782
+#: ../../Zotlabs/Widget/Album.php:95
+msgid "Edit Album"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Channel.php:578
-msgid "Start calendar week on Monday"
+#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:784
+#: ../../Zotlabs/Module/Photos.php:1321
+#: ../../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
+msgid "Upload"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Settings/Features.php:45
-msgid "Additional Features"
+#: ../../Zotlabs/Module/Dreport.php:128
+msgid "mail delivered"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Tokens.php:31
+#: ../../Zotlabs/Module/Dreport.php:148
#, php-format
-msgid "This channel is limited to %d tokens"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:37
-msgid "Name and Password are required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:77
-msgid "Token saved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:113
-msgid ""
-"Use this form to create temporary access identifiers to share things with "
-"non-members. These identities may be used in Access Control Lists and "
-"visitors may login using these credentials to access private content."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:115
-msgid ""
-"You may also provide <em>dropbox</em> style access links to friends and "
-"associates by adding the Login Password to any specific site URL as shown. "
-"Examples:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:150
-#: ../../Zotlabs/Widget/Settings_menu.php:90
-msgid "Guest Access Tokens"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:157
-msgid "Login Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:158
-msgid "Login Password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:159
-msgid "Expires (yyyy-mm-dd)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
-#: ../../Zotlabs/Module/Connedit.php:885
-msgid "Their Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:20
-msgid "Not valid email."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:23
-msgid "Protected email address. Cannot change to that email."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:32
-msgid "System failure storing new email. Please try again."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:40
-msgid "Technical skill level updated"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:56
-msgid "Password verification failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:63
-msgid "Passwords do not match. Password unchanged."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:67
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:81
-msgid "Password changed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:83
-msgid "Password update failed. Please try again."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:112
-msgid "Account Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:113
-msgid "Current Password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:114
-msgid "Enter New Password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:115
-msgid "Confirm New Password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:115
-msgid "Leave password fields blank unless changing"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:116
-msgid "Your technical skill level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:116
-msgid "Used to provide a member experience matched to your comfort level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:120
-#: ../../Zotlabs/Module/Removeaccount.php:61
-msgid "Remove Account"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Account.php:121
-msgid "Remove this account including all its channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Featured.php:20
-msgid "Affinity Slider settings updated."
+msgid "Delivery report for %1$s"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Featured.php:34
-msgid "No feature settings configured"
+#: ../../Zotlabs/Module/Dreport.php:151
+msgid "Options"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Featured.php:41
-msgid "Default maximum affinity level"
+#: ../../Zotlabs/Module/Dreport.php:152
+msgid "Redeliver"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Featured.php:46
-msgid "Default minimum affinity level"
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+msgid "webpage"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Featured.php:50
-msgid "Affinity Slider Settings"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+msgid "block"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Featured.php:60
-msgid "Feature/Addon Settings"
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+msgid "layout"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:145
-msgid "No special theme for mobile devices"
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+msgid "menu"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:148
+#: ../../Zotlabs/Module/Impel.php:181
#, php-format
-msgid "%s - (Experimental)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:198
-msgid "Display Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:199
-msgid "Theme Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:200
-msgid "Custom Theme Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:201
-msgid "Content Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:207
-msgid "Display Theme:"
+msgid "%s element installed"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:208
-msgid "Select scheme"
+#: ../../Zotlabs/Module/Impel.php:184
+#, php-format
+msgid "%s element installation failed"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:210
-msgid "Mobile Theme:"
+#: ../../Zotlabs/Module/Setup.php:176
+msgid "$Projectname Server - Setup"
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:211
-msgid "Preload images before rendering the page"
+#: ../../Zotlabs/Module/Setup.php:180
+msgid "Could not connect to database."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Display.php:211
+#: ../../Zotlabs/Module/Setup.php:184
msgid ""
-"The subjective page load time will be longer but the page will be ready when "
-"displayed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:212
-msgid "Enable user zoom on mobile devices"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:213
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:213
-msgid "Minimum of 10 seconds, no maximum"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:214
-msgid "Maximum number of conversations to load at any time:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:214
-msgid "Maximum of 100 items"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:215
-msgid "Show emoticons (smilies) as images"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:216
-msgid "Manual conversation updates"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:216
-msgid "Default is on, turning this off may increase screen jumping"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:217
-msgid "Link post titles to source"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:218
-msgid "System Page Layout Editor - (advanced)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:221
-msgid "Use blog/list mode on channel page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:221
-#: ../../Zotlabs/Module/Settings/Display.php:222
-msgid "(comments displayed separately)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:222
-msgid "Use blog/list mode on grid page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:223
-msgid "Channel page max height of content (in pixels)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:223
-#: ../../Zotlabs/Module/Settings/Display.php:224
-msgid "click to expand content exceeding this height"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:224
-msgid "Grid page max height of content (in pixels)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:34
-msgid "Name is required"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:38
-msgid "Key and Secret are required"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:86
-#: ../../Zotlabs/Module/Settings/Oauth.php:112
-#: ../../Zotlabs/Module/Settings/Oauth.php:148
-msgid "Add application"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:89
-msgid "Name of application"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth.php:116
-#: ../../addon/statusnet/statusnet.php:893 ../../addon/twitter/twitter.php:775
-msgid "Consumer Key"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:90
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-msgid "Automatically generated - change if desired. Max length 20"
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Oauth.php:91
-#: ../../Zotlabs/Module/Settings/Oauth.php:117
-#: ../../addon/statusnet/statusnet.php:892 ../../addon/twitter/twitter.php:776
-msgid "Consumer Secret"
+#: ../../Zotlabs/Module/Setup.php:191
+msgid "Could not create table."
msgstr ""
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
-#: ../../Zotlabs/Module/Settings/Oauth.php:118
-msgid "Redirect"
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Setup.php:196
+msgid "Your site database has been installed."
+=======
+#: ../../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
+msgid "Permissions"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Settings/Oauth.php:92
+#: ../../Zotlabs/Module/Setup.php:200
msgid ""
-"Redirect URI - leave blank unless your application specifically requires this"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-#: ../../Zotlabs/Module/Settings/Oauth.php:119
-msgid "Icon url"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:93
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
-msgid "Optional"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:104
-msgid "Application not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:147
-msgid "Connected Apps"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:151
-msgid "Client key starts with"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:152
-msgid "No name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Oauth.php:153
-msgid "Remove authorization"
-msgstr ""
-
-#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:751
-#: ../../Zotlabs/Module/Photos.php:1290 ../../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:700
-#: ../../Zotlabs/Lib/Apps.php:778 ../../Zotlabs/Storage/Browser.php:163
-#: ../../Zotlabs/Widget/Portfolio.php:86 ../../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:1108
-msgid "Unknown"
-msgstr ""
-
-#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:782
-#: ../../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/Profile_photo.php:423
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:334
-#: ../../Zotlabs/Widget/Portfolio.php:99 ../../Zotlabs/Widget/Album.php:97
-#: ../../addon/cdav/include/widgets.php:132
-#: ../../addon/cdav/include/widgets.php:168
-msgid "Upload"
-msgstr ""
-
-#: ../../Zotlabs/Module/Achievements.php:38
-msgid "Some blurb about what to do when you're new here"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:114
-msgid "Thing updated"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:166
-msgid "Object store: failed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:170
-msgid "Thing added"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:196
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
msgstr ""
-#: ../../Zotlabs/Module/Thing.php:259
-msgid "Show Thing"
+#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
+#: ../../Zotlabs/Module/Setup.php:741
+msgid "Please see the file \"install/INSTALL.txt\"."
msgstr ""
-#: ../../Zotlabs/Module/Thing.php:266
-msgid "item not found."
+#: ../../Zotlabs/Module/Setup.php:260
+msgid "System check"
msgstr ""
-#: ../../Zotlabs/Module/Thing.php:299
-msgid "Edit Thing"
+#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:690
+#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Photos.php:920
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
+msgid "Next"
msgstr ""
-#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:355
-msgid "Select a profile"
+#: ../../Zotlabs/Module/Setup.php:265
+msgid "Check again"
msgstr ""
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358
-msgid "Post an activity"
+#: ../../Zotlabs/Module/Setup.php:287
+msgid "Database connection"
msgstr ""
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358
-msgid "Only sends to viewers of the applicable profile"
+#: ../../Zotlabs/Module/Setup.php:288
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
msgstr ""
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:360
-msgid "Name of thing e.g. something"
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Setup.php:289
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
msgstr ""
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:361
-msgid "URL of thing (optional)"
+#: ../../Zotlabs/Module/Setup.php:290
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
msgstr ""
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:362
-msgid "URL for photo of thing (optional)"
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Database Server Name"
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
-msgid "Permissions"
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Default is 127.0.0.1"
msgstr ""
-#: ../../Zotlabs/Module/Thing.php:353
-msgid "Add Thing to your Profile"
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Database Port"
msgstr ""
-#: ../../Zotlabs/Module/Notify.php:57 ../../Zotlabs/Module/Notifications.php:38
-msgid "No more system notifications."
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Communication port number - use 0 for default"
msgstr ""
-#: ../../Zotlabs/Module/Notify.php:61 ../../Zotlabs/Module/Notifications.php:42
-msgid "System Notifications"
+#: ../../Zotlabs/Module/Setup.php:296
+msgid "Database Login Name"
msgstr ""
-#: ../../Zotlabs/Module/Follow.php:31
-msgid "Channel added."
+#: ../../Zotlabs/Module/Setup.php:297
+msgid "Database Login Password"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:144
-#, php-format
-msgid "Your service plan only allows %d channels."
+#: ../../Zotlabs/Module/Setup.php:298
+msgid "Database Name"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:158
-msgid "No channel. Import failed."
+#: ../../Zotlabs/Module/Setup.php:299
+msgid "Database Type"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:467
-#: ../../addon/diaspora/import_diaspora.php:142
-msgid "Import completed."
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
+msgid "Site administrator email address"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:495
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
+=======
+#: ../../Zotlabs/Module/Import.php:494
msgid "You must be logged in to use this feature."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:500
+#: ../../Zotlabs/Module/Import.php:499
msgid "Import Channel"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:501
+#: ../../Zotlabs/Module/Import.php:500
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:503
+#: ../../Zotlabs/Module/Import.php:502
msgid "Or provide the old server/hub details"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:504
+#: ../../Zotlabs/Module/Import.php:503
msgid "Your old identity address (xyz@example.com)"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:505
+#: ../../Zotlabs/Module/Import.php:504
msgid "Your old login email address"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:506
+#: ../../Zotlabs/Module/Import.php:505
msgid "Your old login password"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:507
+#: ../../Zotlabs/Module/Import.php:506
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 "
@@ -3975,147 +4451,180 @@ msgid ""
"location for files, photos, and media."
msgstr ""
-#: ../../Zotlabs/Module/Import.php:508
+#: ../../Zotlabs/Module/Import.php:507
msgid "Make this hub my primary location"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:509
+#: ../../Zotlabs/Module/Import.php:508
msgid "Move this channel (disable all previous locations)"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:510
+#: ../../Zotlabs/Module/Import.php:509
msgid "Import a few months of posts if possible (limited by available memory"
msgstr ""
-#: ../../Zotlabs/Module/Import.php:511
+#: ../../Zotlabs/Module/Import.php:510
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
+"Your account email address must match this in order to use the web admin "
+"panel."
msgstr ""
-#: ../../Zotlabs/Module/Rmagic.php:35
-msgid "Authentication failed."
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
+msgid "Website URL"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
+msgid "Please use SSL (https) URL if available."
msgstr ""
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1993
+#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:346
+msgid "Please select a default timezone for your website"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:331
+msgid "Site settings"
+=======
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1984
msgid "Remote Authentication"
msgstr ""
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1994
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1985
msgid "Enter your channel address (e.g. channel@example.com)"
msgstr ""
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1995
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1986
msgid "Authenticate"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96
-#: ../../Zotlabs/Module/Page.php:76 ../../Zotlabs/Module/Wall_upload.php:31
-#: ../../Zotlabs/Module/Block.php:43
-msgid "Channel not found."
+#: ../../Zotlabs/Module/Setup.php:385
+msgid "PHP version 5.5 or greater is required."
msgstr ""
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
+#: ../../Zotlabs/Module/Setup.php:386
+msgid "PHP version"
msgstr ""
-#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2304
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Setup.php:402
+msgid "Could not find a command line version of PHP in the web server PATH."
+=======
+#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2291
msgid "Import"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
-msgid "Authorize application connection"
+#: ../../Zotlabs/Module/Setup.php:403
+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/Api.php:73
-msgid "Return to your app and insert this Security Code:"
+#: ../../Zotlabs/Module/Setup.php:407
+msgid "PHP executable path"
msgstr ""
-#: ../../Zotlabs/Module/Api.php:83
-msgid "Please login to continue."
+#: ../../Zotlabs/Module/Setup.php:407
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
msgstr ""
-#: ../../Zotlabs/Module/Api.php:95
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+#: ../../Zotlabs/Module/Setup.php:412
+msgid "Command line PHP"
msgstr ""
-#: ../../Zotlabs/Module/Attach.php:13
-msgid "Item not available."
+#: ../../Zotlabs/Module/Setup.php:422
+msgid ""
+"Unable to check command line PHP, as shell_exec() is disabled. This is "
+"required."
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Setup.php:425
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+=======
#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:205
-#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288
-#: ../../Zotlabs/Module/Mail.php:430 ../../include/conversation.php:1226
+#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:306
+#: ../../Zotlabs/Module/Mail.php:448 ../../include/conversation.php:1228
msgid "Insert web link"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1337
-msgid "Title (optional)"
+#: ../../Zotlabs/Module/Setup.php:426
+msgid "This is required for message delivery to work."
msgstr ""
-#: ../../Zotlabs/Module/Editblock.php:138
-msgid "Edit Block"
+#: ../../Zotlabs/Module/Setup.php:429
+msgid "PHP register_argc_argv"
msgstr ""
-#: ../../Zotlabs/Module/Profile.php:91
-msgid "vcard"
+#: ../../Zotlabs/Module/Setup.php:447
+#, 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/Apps.php:45
-msgid "Apps"
+#: ../../Zotlabs/Module/Setup.php:452
+msgid "You can adjust these settings in the server php.ini file."
msgstr ""
-#: ../../Zotlabs/Module/Apps.php:48
-msgid "Manage apps"
+#: ../../Zotlabs/Module/Setup.php:454
+msgid "PHP upload limits"
msgstr ""
-#: ../../Zotlabs/Module/Apps.php:49
-msgid "Create new app"
+#: ../../Zotlabs/Module/Setup.php:477
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
msgstr ""
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:256
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
+#: ../../Zotlabs/Module/Setup.php:478
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
msgstr ""
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234
-msgid "Mood"
+#: ../../Zotlabs/Module/Setup.php:481
+msgid "Generate encryption keys"
msgstr ""
-#: ../../Zotlabs/Module/Mood.php:136
-msgid "Set your current mood and tell your friends"
+#: ../../Zotlabs/Module/Setup.php:498
+msgid "libCurl PHP module"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:52
-#: ../../Zotlabs/Module/Connections.php:157
-#: ../../Zotlabs/Module/Connections.php:246
-msgid "Blocked"
+#: ../../Zotlabs/Module/Setup.php:499
+msgid "GD graphics PHP module"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:57
-#: ../../Zotlabs/Module/Connections.php:164
-#: ../../Zotlabs/Module/Connections.php:245
-msgid "Ignored"
+#: ../../Zotlabs/Module/Setup.php:500
+msgid "OpenSSL PHP module"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:62
-#: ../../Zotlabs/Module/Connections.php:178
-#: ../../Zotlabs/Module/Connections.php:244
-msgid "Hidden"
+#: ../../Zotlabs/Module/Setup.php:501
+msgid "PDO database PHP module"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:67
-#: ../../Zotlabs/Module/Connections.php:171
-#: ../../Zotlabs/Module/Connections.php:243
-msgid "Archived"
+#: ../../Zotlabs/Module/Setup.php:502
+msgid "mb_string PHP module"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Setup.php:503
+msgid "xml PHP module"
msgstr ""
+#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
+msgid "Apache mod_rewrite module"
+=======
#: ../../Zotlabs/Module/Connections.php:72
#: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1664
+#: ../../include/conversation.php:1666
msgid "New"
msgstr ""
@@ -4123,358 +4632,426 @@ msgstr ""
#: ../../Zotlabs/Module/Connections.php:103
#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30
msgid "All"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:134
-msgid "New Connections"
+#: ../../Zotlabs/Module/Setup.php:507
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:137
-msgid "Show pending (new) connections"
+#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
+msgid "exec"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:144
-msgid "Show all connections"
+#: ../../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/Connections.php:160
-msgid "Only show blocked connections"
+#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
+msgid "shell_exec"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:167
-msgid "Only show ignored connections"
+#: ../../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/Connections.php:174
-msgid "Only show archived connections"
+#: ../../Zotlabs/Module/Setup.php:527
+msgid "Error: libCURL PHP module required but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:181
-msgid "Only show hidden connections"
+#: ../../Zotlabs/Module/Setup.php:531
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:242
-msgid "Pending approval"
+#: ../../Zotlabs/Module/Setup.php:535
+msgid "Error: openssl PHP module required but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:258
-#, php-format
-msgid "%1$s [%2$s]"
+#: ../../Zotlabs/Module/Setup.php:539
+msgid "Error: PDO database PHP module required but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:259
-msgid "Edit connection"
+#: ../../Zotlabs/Module/Setup.php:543
+msgid "Error: mb_string PHP module required but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:260
-msgid "Delete connection"
+#: ../../Zotlabs/Module/Setup.php:547
+msgid "Error: xml PHP module required for DAV but not installed."
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:269
-msgid "Channel address"
+#: ../../Zotlabs/Module/Setup.php:565
+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/Connections.php:271
-msgid "Network"
+#: ../../Zotlabs/Module/Setup.php:566
+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/Connections.php:274
-msgid "Call"
+#: ../../Zotlabs/Module/Setup.php:567
+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/Connections.php:276
-msgid "Status"
+#: ../../Zotlabs/Module/Setup.php:568
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"install/INSTALL.txt\" for instructions."
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:278
-msgid "Connected"
+#: ../../Zotlabs/Module/Setup.php:571
+msgid ".htconfig.php is writable"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:280
-msgid "Approve connection"
+#: ../../Zotlabs/Module/Setup.php:585
+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/Connections.php:282
-msgid "Ignore connection"
+#: ../../Zotlabs/Module/Setup.php:586
+#, 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 ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Setup.php:587 ../../Zotlabs/Module/Setup.php:608
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
+=======
#: ../../Zotlabs/Module/Connections.php:283
#: ../../Zotlabs/Module/Connedit.php:626
msgid "Ignore"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:284
-msgid "Recent activity"
+#: ../../Zotlabs/Module/Setup.php:588
+#, 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 ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Setup.php:591
+#, php-format
+msgid "%s is writable"
+=======
#: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216
#: ../../include/text.php:957 ../../include/nav.php:185
msgid "Connections"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:313
-msgid "Search your connections"
+#: ../../Zotlabs/Module/Setup.php:607
+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/Connections.php:314
-msgid "Connections search"
+#: ../../Zotlabs/Module/Setup.php:611
+msgid "store is writable"
msgstr ""
-#: ../../Zotlabs/Module/Connections.php:315
-#: ../../Zotlabs/Module/Directory.php:391
-#: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23
-msgid "Find"
+#: ../../Zotlabs/Module/Setup.php:643
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
msgstr ""
+#: ../../Zotlabs/Module/Setup.php:644
+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 ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Setup.php:645
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+=======
#: ../../Zotlabs/Module/Viewsrc.php:43
msgid "item"
msgstr ""
#: ../../Zotlabs/Module/Viewsrc.php:55
msgid "Source of Item"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
+#: ../../Zotlabs/Module/Setup.php:646
+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/Bookmarks.php:76
-msgid "My Bookmarks"
+#: ../../Zotlabs/Module/Setup.php:647
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
msgstr ""
-#: ../../Zotlabs/Module/Bookmarks.php:87
-msgid "My Connections Bookmarks"
+#: ../../Zotlabs/Module/Setup.php:648
+msgid ""
+"Providers are available that issue free certificates which are browser-valid."
msgstr ""
-#: ../../Zotlabs/Module/Removeaccount.php:35
+#: ../../Zotlabs/Module/Setup.php:650
msgid ""
-"Account removals are not allowed within 48 hours of changing the account "
-"password."
+"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. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
msgstr ""
-#: ../../Zotlabs/Module/Removeaccount.php:57
-msgid "Remove This Account"
+#: ../../Zotlabs/Module/Setup.php:652
+msgid "SSL certificate validation"
msgstr ""
-#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Setup.php:658
msgid ""
-"This account and all its channels will be completely removed from the "
-"network. "
+"Url rewrite in .htaccess is not working. Check your server configuration."
+"Test: "
msgstr ""
-#: ../../Zotlabs/Module/Removeaccount.php:60
-msgid ""
-"Remove this account, all its channels and all its channel clones from the "
-"network"
+#: ../../Zotlabs/Module/Setup.php:661
+msgid "Url rewrite is working"
msgstr ""
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Zotlabs/Module/Setup.php:675
msgid ""
-"By default only the instances of the channels located on this hub will be "
-"removed from the network"
+"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/Photos.php:78
-msgid "Page owner information could not be retrieved."
+#: ../../Zotlabs/Module/Setup.php:699
+#: ../../extend/addon/addon/cdav/cdav.php:41
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:401
+msgid "Errors encountered creating database tables."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120
-msgid "Album not found."
+#: ../../Zotlabs/Module/Setup.php:739
+msgid "<h1>What next</h1>"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:103
-msgid "Delete Album"
+#: ../../Zotlabs/Module/Setup.php:740
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1023
-msgid "Delete Photo"
+#: ../../Zotlabs/Module/Import_items.php:108
+msgid "Import completed"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:501
-msgid "No photos selected"
+#: ../../Zotlabs/Module/Import_items.php:125
+msgid "Import Items"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:550
-msgid "Access to this item is restricted."
+#: ../../Zotlabs/Module/Import_items.php:126
+msgid "Use this form to import existing posts and content from an export file."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:591
+#: ../../Zotlabs/Module/Manage.php:136
+#: ../../Zotlabs/Module/New_channel.php:121
#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgid "You have created %1$.0f of %2$.0f allowed channels."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:594
-#, php-format
-msgid "%1$.2f MB photo storage used."
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create a new channel"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:636
-msgid "Upload Photos"
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:201
+msgid "Channel Manager"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:640
-msgid "Enter an album name"
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:641
-msgid "or select an existing album (doubleclick)"
+#: ../../Zotlabs/Module/Manage.php:167
+msgid "Switch to one of your channels by selecting it."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:642
-msgid "Create a status post for this upload"
+#: ../../Zotlabs/Module/Manage.php:168
+msgid "Default Channel"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:643
-msgid "Caption (optional):"
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:644
-msgid "Description (optional):"
+#: ../../Zotlabs/Module/Manage.php:172
+#, php-format
+msgid "%d new messages"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:725
-msgid "Show Newest First"
+#: ../../Zotlabs/Module/Manage.php:173
+#, php-format
+msgid "%d new introductions"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:727
-msgid "Show Oldest First"
+#: ../../Zotlabs/Module/Manage.php:175
+msgid "Delegated Channel"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:832
-msgid "Permission denied. Access to this item may be restricted."
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:834
-msgid "Photo not available"
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:892
-msgid "Use as profile photo"
+#: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97
+#: ../../Zotlabs/Module/Blocks.php:155
+msgid "Block Name"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:893
-msgid "Use as cover photo"
+#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1339
+msgid "Title (optional)"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:900
-msgid "Private Photo"
+#: ../../Zotlabs/Module/Editblock.php:138
+msgid "Edit Block"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:915
-msgid "View Full Size"
+#: ../../Zotlabs/Module/Magic.php:71
+msgid "Hub not found."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:997
-msgid "Edit photo"
+#: ../../Zotlabs/Module/Mitem.php:52
+msgid "Unable to create element."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:999
-msgid "Rotate CW (right)"
+#: ../../Zotlabs/Module/Mitem.php:76
+msgid "Unable to update menu element."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1000
-msgid "Rotate CCW (left)"
+#: ../../Zotlabs/Module/Mitem.php:92
+msgid "Unable to add menu element."
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1003
-msgid "Move photo to album"
+#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
+msgid "Menu Item Permissions"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1004
-msgid "Enter a new album name"
+#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
+#: ../../Zotlabs/Module/Settings/Channel.php:510
+msgid "(click to open/close)"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1005
-msgid "or select an existing one (doubleclick)"
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
+msgid "Link Name"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1008
-msgid "Caption"
+#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
+msgid "Link or Submenu Target"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1010
-msgid "Add a Tag"
+#: ../../Zotlabs/Module/Mitem.php:161
+msgid "Enter URL of the link or select a menu name to create a submenu"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1018
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
+msgid "Use magic-auth if available"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1021
-msgid "Flag as adult in album view"
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
+msgid "Open link in new window"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:269
-msgid "I like this (toggle)"
+#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+msgid "Order in list"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:270
-msgid "I don't like this (toggle)"
+#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+msgid "Higher numbers will sink to bottom of listing"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:412
-#: ../../include/conversation.php:737
-msgid "Please wait"
+#: ../../Zotlabs/Module/Mitem.php:165
+msgid "Submit and finish"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1059 ../../Zotlabs/Module/Photos.php:1177
-#: ../../Zotlabs/Lib/ThreadItem.php:729
-msgid "This is you"
+#: ../../Zotlabs/Module/Mitem.php:166
+msgid "Submit and continue"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179
-#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/js_strings.php:6
-msgid "Comment"
+#: ../../Zotlabs/Module/Mitem.php:174
+msgid "Menu:"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:570
-msgctxt "title"
-msgid "Likes"
+#: ../../Zotlabs/Module/Mitem.php:177
+msgid "Link Target"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:570
-msgctxt "title"
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Edit menu"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:571
-msgctxt "title"
-msgid "Agree"
+#: ../../Zotlabs/Module/Mitem.php:183
+msgid "Edit element"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:571
-msgctxt "title"
-msgid "Disagree"
+#: ../../Zotlabs/Module/Mitem.php:184
+msgid "Drop element"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:571
-msgctxt "title"
-msgid "Abstain"
+#: ../../Zotlabs/Module/Mitem.php:185
+msgid "New element"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:572
-msgctxt "title"
-msgid "Attending"
+#: ../../Zotlabs/Module/Mitem.php:186
+msgid "Edit this menu container"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:572
-msgctxt "title"
-msgid "Not attending"
+#: ../../Zotlabs/Module/Mitem.php:187
+msgid "Add menu element"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:572
-msgctxt "title"
-msgid "Might attend"
+#: ../../Zotlabs/Module/Mitem.php:188
+msgid "Delete this menu item"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1108
-#: ../../Zotlabs/Lib/ThreadItem.php:187 ../../Zotlabs/Lib/ThreadItem.php:199
-msgid "View all"
+#: ../../Zotlabs/Module/Mitem.php:189
+msgid "Edit this menu item"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:206
+msgid "Menu item not found."
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Mitem.php:219
+msgid "Menu item deleted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:221
+msgid "Menu item could not be deleted."
+msgstr ""
+=======
#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:191
-#: ../../include/conversation.php:1905 ../../include/channel.php:1282
-#: ../../include/taxonomy.php:433
+#: ../../include/conversation.php:1907 ../../include/channel.php:1268
+#: ../../include/taxonomy.php:403
msgctxt "noun"
msgid "Like"
msgid_plural "Likes"
@@ -4482,243 +5059,398 @@ msgstr[0] ""
msgstr[1] ""
#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:196
-#: ../../include/conversation.php:1908
+#: ../../include/conversation.php:1910
msgctxt "noun"
msgid "Dislike"
msgid_plural "Dislikes"
msgstr[0] ""
msgstr[1] ""
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
-#: ../../Zotlabs/Module/Photos.php:1205
-msgid "Photo Tools"
+#: ../../Zotlabs/Module/Mitem.php:228
+msgid "Edit Menu Element"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1214
-msgid "In This Photo:"
+#: ../../Zotlabs/Module/Mitem.php:238
+msgid "Link text"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1219
-msgid "Map"
+#: ../../Zotlabs/Module/Ratings.php:70
+msgid "No ratings"
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:401
-msgctxt "noun"
-msgid "Likes"
+#: ../../Zotlabs/Module/Ratings.php:98
+msgid "Rating: "
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:402
-msgctxt "noun"
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Ratings.php:99
+msgid "Website: "
msgstr ""
-#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:407
-#: ../../include/acl_selectors.php:220
-msgid "Close"
+#: ../../Zotlabs/Module/Ratings.php:101
+msgid "Description: "
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Attach.php:13
+msgid "Item not available."
+=======
#: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318
#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:529
msgid "Recent Photos"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
#: ../../Zotlabs/Module/Wiki.php:30
msgid "Profile Unavailable."
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:44 ../../addon/gitwiki/Mod_Gitwiki.php:42
+#: ../../Zotlabs/Module/Wiki.php:44
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:42
msgid "Not found"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:68 ../../addon/gitwiki/Mod_Gitwiki.php:62
+#: ../../Zotlabs/Module/Wiki.php:68
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:62
msgid "Invalid channel"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Wiki.php:160
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:146
+#: ../../include/conversation.php:1845
+=======
#: ../../Zotlabs/Module/Wiki.php:160 ../../addon/gitwiki/Mod_Gitwiki.php:146
-#: ../../include/conversation.php:1852 ../../include/nav.php:455
+#: ../../include/conversation.php:1854 ../../include/nav.php:462
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "Wikis"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:166 ../../addon/gitwiki/Mod_Gitwiki.php:152
+#: ../../Zotlabs/Module/Wiki.php:166
+#: ../../extend/addon/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
-#: ../../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:170
+#: ../../extend/addon/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:171
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157
msgid "Content type"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:173 ../../Zotlabs/Storage/Browser.php:234
-#: ../../addon/gitwiki/Mod_Gitwiki.php:159
-msgid "Type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:180 ../../addon/gitwiki/Mod_Gitwiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:180
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
msgid "Create a status post for this wiki"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:222 ../../addon/gitwiki/Mod_Gitwiki.php:185
+#: ../../Zotlabs/Module/Wiki.php:205
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:185
msgid "Wiki not found"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:246 ../../addon/gitwiki/Mod_Gitwiki.php:210
+#: ../../Zotlabs/Module/Wiki.php:229
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:210
msgid "Rename page"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:256 ../../addon/gitwiki/Mod_Gitwiki.php:214
+#: ../../Zotlabs/Module/Wiki.php:233
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:214
msgid "Error retrieving page content"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:262
+#: ../../Zotlabs/Module/Wiki.php:239
msgid "New page"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:286 ../../addon/gitwiki/Mod_Gitwiki.php:242
+#: ../../Zotlabs/Module/Wiki.php:263
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
msgid "Revision Comparison"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:287 ../../addon/gitwiki/Mod_Gitwiki.php:243
+#: ../../Zotlabs/Module/Wiki.php:264
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
msgid "Revert"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:291
+#: ../../Zotlabs/Module/Wiki.php:268
msgid "Short description of your changes (optional)"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:298 ../../addon/gitwiki/Mod_Gitwiki.php:252
+#: ../../Zotlabs/Module/Wiki.php:275
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252
msgid "Source"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:307 ../../addon/gitwiki/Mod_Gitwiki.php:260
+#: ../../Zotlabs/Module/Wiki.php:283
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:260
msgid "New page name"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:312 ../../addon/gitwiki/Mod_Gitwiki.php:265
-#: ../../include/conversation.php:1230
+#: ../../Zotlabs/Module/Wiki.php:288
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
+#: ../../include/conversation.php:1232
msgid "Embed image from photo albums"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:313 ../../addon/gitwiki/Mod_Gitwiki.php:266
-#: ../../include/conversation.php:1324
+#: ../../Zotlabs/Module/Wiki.php:289
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
+#: ../../include/conversation.php:1326
msgid "Embed an image from your albums"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:315 ../../addon/gitwiki/Mod_Gitwiki.php:268
-#: ../../include/conversation.php:1326 ../../include/conversation.php:1373
+#: ../../Zotlabs/Module/Wiki.php:291
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
+#: ../../include/conversation.php:1328 ../../include/conversation.php:1375
msgid "OK"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:316 ../../addon/gitwiki/Mod_Gitwiki.php:269
-#: ../../include/conversation.php:1266
+#: ../../Zotlabs/Module/Wiki.php:292
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
+#: ../../include/conversation.php:1268
msgid "Choose images to embed"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:317 ../../addon/gitwiki/Mod_Gitwiki.php:270
-#: ../../include/conversation.php:1267
+#: ../../Zotlabs/Module/Wiki.php:293
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
+#: ../../include/conversation.php:1269
msgid "Choose an album"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:318 ../../addon/gitwiki/Mod_Gitwiki.php:271
+#: ../../Zotlabs/Module/Wiki.php:294
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
msgid "Choose a different album"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:319 ../../addon/gitwiki/Mod_Gitwiki.php:272
-#: ../../include/conversation.php:1269
+#: ../../Zotlabs/Module/Wiki.php:295
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
+#: ../../include/conversation.php:1271
msgid "Error getting album list"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:320 ../../addon/gitwiki/Mod_Gitwiki.php:273
-#: ../../include/conversation.php:1270
+#: ../../Zotlabs/Module/Wiki.php:296
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
+#: ../../include/conversation.php:1272
msgid "Error getting photo link"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:321 ../../addon/gitwiki/Mod_Gitwiki.php:274
-#: ../../include/conversation.php:1271
+#: ../../Zotlabs/Module/Wiki.php:297
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:274
+#: ../../include/conversation.php:1273
msgid "Error getting album"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:388 ../../addon/gitwiki/Mod_Gitwiki.php:337
+#: ../../Zotlabs/Module/Wiki.php:365
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
msgid "Error creating wiki. Invalid name."
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:395
+#: ../../Zotlabs/Module/Wiki.php:372
msgid "A wiki with this name already exists."
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:408 ../../addon/gitwiki/Mod_Gitwiki.php:348
+#: ../../Zotlabs/Module/Wiki.php:385
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
msgid "Wiki created, but error creating Home page."
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:415 ../../addon/gitwiki/Mod_Gitwiki.php:353
+#: ../../Zotlabs/Module/Wiki.php:392
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
msgid "Error creating wiki"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:427
+#: ../../Zotlabs/Module/Wiki.php:404
msgid "Wiki delete permission denied."
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:437
+#: ../../Zotlabs/Module/Wiki.php:414
msgid "Error deleting wiki"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:463 ../../addon/gitwiki/Mod_Gitwiki.php:400
+#: ../../Zotlabs/Module/Wiki.php:440
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
msgid "New page created"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:584
+#: ../../Zotlabs/Module/Wiki.php:559
msgid "Cannot delete Home"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:648
+#: ../../Zotlabs/Module/Wiki.php:623
msgid "Current Revision"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:648
+#: ../../Zotlabs/Module/Wiki.php:623
msgid "Selected Revision"
msgstr ""
-#: ../../Zotlabs/Module/Wiki.php:698
+#: ../../Zotlabs/Module/Wiki.php:673
msgid "You must be authenticated."
msgstr ""
-#: ../../Zotlabs/Module/Chanview.php:134
-msgid "toggle full screen mode"
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:38
+msgid "No more system notifications."
msgstr ""
-#: ../../Zotlabs/Module/Pdledit.php:21
-msgid "Layout updated."
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:42
+msgid "System Notifications"
msgstr ""
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:217
-msgid "Feature disabled."
+#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
+msgid "Authorize application connection"
msgstr ""
-#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69
-msgid "Edit System Page Description"
+#: ../../Zotlabs/Module/Api.php:73
+msgid "Return to your app and insert this Security Code:"
msgstr ""
-#: ../../Zotlabs/Module/Pdledit.php:64
-msgid "Layout not found."
+#: ../../Zotlabs/Module/Api.php:83
+msgid "Please login to continue."
msgstr ""
-#: ../../Zotlabs/Module/Pdledit.php:70
-msgid "Module Name:"
+#: ../../Zotlabs/Module/Api.php:95
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
msgstr ""
-#: ../../Zotlabs/Module/Pdledit.php:71
-msgid "Layout Help"
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:67
+msgid "Please join us on $Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:77
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:82
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:86
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Invite.php:105
+msgid "You have no more invitations available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Send invitations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:137
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284
+msgid "Your message:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:139
+msgid "Please join my community on $Projectname."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "You will need to supply this invitation code:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "1. Register at any $Projectname location (they are all inter-connected)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:145
+msgid "or visit"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:147
+msgid "3. Click [Connect]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:20
+msgid "About this site"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:21
+msgid "Site Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1474
+msgid "Administrator"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:28
+msgid "Software and Project information"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:29
+msgid "This site is powered by $Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:30
+msgid ""
+"Federated and decentralised networking and identity services provided by Zot"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:32
+#, php-format
+msgid "Version %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:33
+msgid "Project homepage"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Developer homepage"
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:140
+msgid "Create Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:141
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:142
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile.php:91
+msgid "vcard"
+msgstr ""
+
+#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:186
+msgid "Mark all system notifications seen"
msgstr ""
#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235
-#: ../../include/conversation.php:1040
+#: ../../include/conversation.php:1042
msgid "Poke"
msgstr ""
@@ -4746,6 +5478,11 @@ msgstr ""
msgid "Make this post private"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Search.php:224
+#, php-format
+msgid "Items tagged with: %s"
+=======
#: ../../Zotlabs/Module/Profile_photo.php:61
#: ../../Zotlabs/Module/Cover_photo.php:56
msgid "Image uploaded but image cropping failed."
@@ -4753,174 +5490,206 @@ msgstr ""
#: ../../Zotlabs/Module/Profile_photo.php:115
#: ../../Zotlabs/Module/Profile_photo.php:226
-#: ../../include/photo/photo_driver.php:648
+#: ../../include/photo/photo_driver.php:647
msgid "Profile Photos"
msgstr ""
#: ../../Zotlabs/Module/Profile_photo.php:137
#: ../../Zotlabs/Module/Cover_photo.php:159
msgid "Image resize failed."
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:196
-#: ../../addon/openclipatar/openclipatar.php:298
+#: ../../Zotlabs/Module/Search.php:226
+#, php-format
+msgid "Search results for: %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:19
+msgid "Like/Dislike"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:24
+msgid "This action is restricted to members."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:25
msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
+"\"register\">register as a new $Projectname member</a> to continue."
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:203
-#: ../../Zotlabs/Module/Cover_photo.php:173 ../../include/photos.php:149
-msgid "Unable to process image"
+#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
+#: ../../Zotlabs/Module/Like.php:169
+msgid "Invalid request."
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:238
-#: ../../Zotlabs/Module/Cover_photo.php:197
-msgid "Image upload failed."
+#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:122
+msgid "channel"
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:257
-#: ../../Zotlabs/Module/Cover_photo.php:214
-msgid "Unable to process image."
+#: ../../Zotlabs/Module/Like.php:146
+msgid "thing"
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:365
-#: ../../Zotlabs/Module/Cover_photo.php:307
-#: ../../Zotlabs/Module/Cover_photo.php:322
-msgid "Photo not available."
+#: ../../Zotlabs/Module/Like.php:192
+msgid "Channel unavailable."
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:420
-#: ../../Zotlabs/Module/Cover_photo.php:358
-msgid "Upload File:"
+#: ../../Zotlabs/Module/Like.php:240
+msgid "Previous action reversed."
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:421
-#: ../../Zotlabs/Module/Cover_photo.php:359
-msgid "Select a profile:"
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47
+#: ../../extend/addon/addon/redphotos/redphotohelper.php:71
+#: ../../include/text.php:1943 ../../include/conversation.php:116
+msgid "photo"
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:422
-msgid "Use Photo for Profile"
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../include/text.php:1949 ../../include/conversation.php:144
+msgid "status"
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:422
-msgid "Upload Profile Photo"
+#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1946
+#: ../../include/event.php:1145 ../../include/conversation.php:119
+msgid "event"
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:423
-#: ../../addon/openclipatar/openclipatar.php:182
-#: ../../addon/openclipatar/openclipatar.php:194
-msgid "Use"
+#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:160
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:429
-#: ../../Zotlabs/Module/Cover_photo.php:365
-msgid "skip this step"
+#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:163
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:429
-#: ../../Zotlabs/Module/Cover_photo.php:365
-msgid "select a photo from your photo albums"
+#: ../../Zotlabs/Module/Like.php:423
+#, php-format
+msgid "%1$s agrees with %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:448
-#: ../../Zotlabs/Module/Cover_photo.php:381
-msgid "Crop Image"
+#: ../../Zotlabs/Module/Like.php:425
+#, php-format
+msgid "%1$s doesn't agree with %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:449
-#: ../../Zotlabs/Module/Cover_photo.php:382
-msgid "Please adjust the image cropping for optimum viewing."
+#: ../../Zotlabs/Module/Like.php:427
+#, php-format
+msgid "%1$s abstains from a decision on %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Profile_photo.php:451
-#: ../../Zotlabs/Module/Cover_photo.php:384
-msgid "Done Editing"
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Like.php:429
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Chatsvc.php:131
-msgid "Away"
+#: ../../Zotlabs/Module/Like.php:431
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Chatsvc.php:136
-msgid "Online"
+#: ../../Zotlabs/Module/Like.php:433
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:538
+msgid "Action completed."
msgstr ""
+#: ../../Zotlabs/Module/Like.php:539
+msgid "Thank you."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
+=======
#: ../../Zotlabs/Module/Item.php:185
msgid "Unable to locate original post."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:470
+#: ../../Zotlabs/Module/Item.php:451
msgid "Empty post discarded."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:844
+#: ../../Zotlabs/Module/Item.php:825
msgid "Duplicate post suppressed."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:984
+#: ../../Zotlabs/Module/Item.php:955
msgid "System error. Post not saved."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:1020
-msgid "Your comment is awaiting approval."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1118
+#: ../../Zotlabs/Module/Item.php:1085
msgid "Unable to obtain post information from database."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:1125
+#: ../../Zotlabs/Module/Item.php:1092
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr ""
-#: ../../Zotlabs/Module/Item.php:1132
+#: ../../Zotlabs/Module/Item.php:1099
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Ping.php:254
-msgid "sent you a private message"
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
msgstr ""
-#: ../../Zotlabs/Module/Ping.php:302
-msgid "added your channel"
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
msgstr ""
-#: ../../Zotlabs/Module/Ping.php:312
-msgid "g A l F d"
+#: ../../Zotlabs/Module/Pconfig.php:49
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please "
+"leave this page unless you are comfortable with and knowledgeable about how "
+"to correctly use this feature."
msgstr ""
-#: ../../Zotlabs/Module/Ping.php:330
-msgid "[today]"
+#: ../../Zotlabs/Module/Subthread.php:118
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Ping.php:339
-msgid "posted an event"
+#: ../../Zotlabs/Module/Subthread.php:120
+#, php-format
+msgid "%1$s stopped following %2$s's %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
-msgid "Invalid item."
+#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:256
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
msgstr ""
-#: ../../Zotlabs/Module/Page.php:129 ../../Zotlabs/Module/Block.php:79
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234
+msgid "Mood"
+=======
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79
#: ../../Zotlabs/Module/Display.php:122
#: ../../Zotlabs/Lib/NativeWikiPage.php:500 ../../Zotlabs/Web/Router.php:146
#: ../../include/help.php:68
msgid "Page not found."
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Page.php:166
-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, "
-"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+#: ../../Zotlabs/Module/Mood.php:136
+msgid "Set your current mood and tell your friends"
msgstr ""
#: ../../Zotlabs/Module/Connedit.php:79
@@ -4962,8 +5731,13 @@ msgid "Connection has been removed."
msgstr ""
#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:228
+<<<<<<< HEAD
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:57
+#: ../../include/nav.php:102 ../../include/conversation.php:982
+=======
#: ../../addon/openclipatar/openclipatar.php:57
-#: ../../include/conversation.php:980 ../../include/nav.php:106
+#: ../../include/conversation.php:982 ../../include/nav.php:106
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "View Profile"
msgstr ""
@@ -5081,6 +5855,21 @@ msgstr ""
msgid "Family"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Connedit.php:707
+#: ../../Zotlabs/Module/Settings/Channel.php:62
+#: ../../Zotlabs/Module/Settings/Channel.php:66
+#: ../../Zotlabs/Module/Settings/Channel.php:67
+#: ../../Zotlabs/Module/Settings/Channel.php:70
+#: ../../Zotlabs/Module/Settings/Channel.php:81
+#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/selectors.php:123
+#: ../../include/channel.php:407 ../../include/channel.php:408
+#: ../../include/channel.php:415
+msgid "Friends"
+msgstr ""
+
+=======
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:29
msgid "Acquaintances"
msgstr ""
@@ -5122,7 +5911,11 @@ msgstr ""
msgid "Connection Default Permissions"
msgstr ""
-#: ../../Zotlabs/Module/Connedit.php:847 ../../include/items.php:3980
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Connedit.php:847 ../../include/items.php:3880
+=======
+#: ../../Zotlabs/Module/Connedit.php:847 ../../include/items.php:3955
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
#, php-format
msgid "Connection: %s"
msgstr ""
@@ -5204,6 +5997,15 @@ msgstr ""
msgid "Connection Pending Approval"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Connedit.php:881
+#: ../../Zotlabs/Module/Settings/Tokens.php:163
+#: ../../Zotlabs/Module/Settings/Permcats.php:105
+msgid "inherited"
+msgstr ""
+
+=======
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
#: ../../Zotlabs/Module/Connedit.php:883
#, php-format
msgid ""
@@ -5211,6 +6013,35 @@ msgid ""
"profile securely."
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Connedit.php:885
+#: ../../Zotlabs/Module/Settings/Tokens.php:160
+msgid "Their Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:886
+#: ../../Zotlabs/Module/Settings/Tokens.php:161
+#: ../../Zotlabs/Module/Settings/Permcats.php:103
+msgid "My Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Zotlabs/Module/Settings/Tokens.php:166
+#: ../../Zotlabs/Module/Settings/Permcats.php:108
+msgid "Individual Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:889
+#: ../../Zotlabs/Module/Settings/Tokens.php:167
+#: ../../Zotlabs/Module/Settings/Permcats.php:109
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can <strong>not</strong> change those settings here."
+msgstr ""
+
+=======
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
#: ../../Zotlabs/Module/Connedit.php:890
msgid ""
"Some permissions may be inherited from your channel's <a href=\"settings"
@@ -5227,6 +6058,51 @@ msgstr ""
msgid "Details"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Connedit.php:903
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137
+msgid "Organisation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:904
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138
+#: ../../include/page_widgets.php:46
+msgid "Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:921
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155
+msgid "P.O. Box"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:922
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156
+msgid "Additional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:923
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157
+msgid "Street"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:924
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158
+msgid "Locality"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:925
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159
+msgid "Region"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:926
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160
+msgid "ZIP Code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2294
+msgid "Blocks"
+=======
#: ../../Zotlabs/Module/Connedit.php:903 ../../addon/cdav/Mod_Cdav.php:1137
msgid "Organisation"
msgstr ""
@@ -5258,19 +6134,19 @@ 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:674
+#: ../../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:675
+#: ../../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:678
+#: ../../include/connections.php:672
msgid "Work"
msgstr ""
@@ -5311,548 +6187,701 @@ msgstr ""
#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:760
#: ../../addon/cdav/Mod_Cdav.php:1161
msgid "Country"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:179
-msgid "Room not found"
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:195
-msgid "Leave Room"
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:196
-msgid "Delete Room"
+#: ../../Zotlabs/Module/Cal.php:264 ../../Zotlabs/Module/Events.php:605
+msgid "l, F j"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "I am away right now"
+#: ../../Zotlabs/Module/Cal.php:313 ../../Zotlabs/Module/Events.php:660
+#: ../../include/text.php:1765
+msgid "Link to Source"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "I am online"
+#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Events.php:688
+msgid "Edit Event"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "Bookmark this room"
+#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Events.php:688
+msgid "Create Event"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:241
-#: ../../Zotlabs/Module/Mail.php:362 ../../include/conversation.php:1261
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Cal.php:344
+#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698
+#: ../../Zotlabs/Module/Photos.php:911
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
+msgid "Previous"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:339 ../../Zotlabs/Module/Events.php:691
+#: ../../include/channel.php:1344
+msgid "Export"
+=======
+#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:259
+#: ../../Zotlabs/Module/Mail.php:380 ../../include/conversation.php:1263
msgid "Please enter a link URL:"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:294
-#: ../../Zotlabs/Module/Mail.php:436 ../../Zotlabs/Lib/ThreadItem.php:744
-#: ../../include/conversation.php:1371
+#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:312
+#: ../../Zotlabs/Module/Mail.php:454 ../../Zotlabs/Lib/ThreadItem.php:744
+#: ../../include/conversation.php:1373
msgid "Encrypt text"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:230
-msgid "New Chatroom"
+#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2318
+msgid "Import"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:231
-msgid "Chatroom name"
+#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Events.php:700
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
+msgid "Today"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:232
-msgid "Expiration of chats (minutes)"
+#: ../../Zotlabs/Module/Rate.php:156
+msgid "Website:"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:248
+#: ../../Zotlabs/Module/Rate.php:159
#, php-format
-msgid "%1$s's Chatrooms"
+msgid "Remote Channel [%s] (not yet known on this site)"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:253
-msgid "No chatrooms available"
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Rating (this information is public)"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:257
-msgid "Expiration"
+#: ../../Zotlabs/Module/Rate.php:161
+msgid "Optionally explain your rating (this information is public)"
msgstr ""
-#: ../../Zotlabs/Module/Chat.php:258
-msgid "min"
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:226
+#: ../../include/photo/photo_driver.php:646
+msgid "Profile Photos"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Profile_photo.php:196
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:298
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
msgstr ""
+#: ../../Zotlabs/Module/Profile_photo.php:422
+msgid "Use Photo for Profile"
+=======
#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
-#: ../../include/conversation.php:1781 ../../include/nav.php:385
+#: ../../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:1789
-#: ../../include/nav.php:393
+#: ../../Zotlabs/Storage/Browser.php:224 ../../include/conversation.php:1791
+#: ../../include/nav.php:400
msgid "Files"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
+#: ../../Zotlabs/Module/Profile_photo.php:422
+msgid "Upload Profile Photo"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:60
-msgid "Unable to create menu."
+#: ../../Zotlabs/Module/Profile_photo.php:423
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:182
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:194
+msgid "Use"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
+#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55
+msgid "App installed."
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
+#: ../../Zotlabs/Module/Appman.php:48
+msgid "Malformed app."
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
+#: ../../Zotlabs/Module/Appman.php:111
+msgid "Embed code"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
+#: ../../Zotlabs/Module/Appman.php:117
+msgid "Edit App"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
+#: ../../Zotlabs/Module/Appman.php:117
+msgid "Create App"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Name of app"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
+#: ../../Zotlabs/Module/Appman.php:123
+msgid "Location (URL) of app"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2281
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Appman.php:124 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Zotlabs/Module/Events.php:473
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:838
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:173
+msgid "Description"
+=======
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2268
msgid "Menus"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:117
-msgid "Bookmarks allowed"
+#: ../../Zotlabs/Module/Appman.php:125
+msgid "Photo icon URL"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
+#: ../../Zotlabs/Module/Appman.php:125
+msgid "80 x 80 pixels - optional"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
+#: ../../Zotlabs/Module/Appman.php:126
+msgid "Categories (optional, comma separated list)"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:121
-msgid "Edit this menu"
+#: ../../Zotlabs/Module/Appman.php:127
+msgid "Version ID"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:136
-msgid "Menu could not be deleted."
+#: ../../Zotlabs/Module/Appman.php:128
+msgid "Price of app"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:149
-msgid "Edit Menu"
+#: ../../Zotlabs/Module/Appman.php:129
+msgid "Location (URL) to purchase app"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:153
-msgid "Add or remove entries to this menu"
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Menu name"
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Must be unique, only seen by you"
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title"
+#: ../../Zotlabs/Module/Chanview.php:134
+msgid "toggle full screen mode"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title as seen by others"
+#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Channel"
msgstr ""
-#: ../../Zotlabs/Module/Menu.php:157
-msgid "Allow bookmarks"
+#: ../../Zotlabs/Module/Uexport.php:59
+msgid ""
+"Export your basic channel information to a file. This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
msgstr ""
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2282
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export Content"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:61
+msgid ""
+"Export your channel information and recent content to a JSON backup that can "
+"be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large. Please be patient - it may take several minutes for "
+"this download to begin."
+=======
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2269
msgid "Layouts"
msgstr ""
#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232
-#: ../../include/nav.php:161 ../../include/nav.php:258
+#: ../../include/nav.php:161 ../../include/nav.php:268
#: ../../include/help.php:55 ../../include/help.php:61
msgid "Help"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Layouts.php:186
-msgid "Comanche page description language help"
+#: ../../Zotlabs/Module/Uexport.php:63
+msgid "Export your posts from a given year."
msgstr ""
-#: ../../Zotlabs/Module/Layouts.php:190
-msgid "Layout Description"
+#: ../../Zotlabs/Module/Uexport.php:65
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
msgstr ""
-#: ../../Zotlabs/Module/Layouts.php:195
-msgid "Download PDL file"
+#: ../../Zotlabs/Module/Uexport.php:66
+#, php-format
+msgid ""
+"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
+"\">%2$s</a>"
msgstr ""
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:334
-msgid "post"
+#: ../../Zotlabs/Module/Uexport.php:67
+#, php-format
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Uexport.php:68
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a href=\"%1$s\">"
+"%2$s</a> on any site containing your channel. For best results please import "
+"or restore these in date order (oldest first)."
+=======
#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146
-#: ../../include/text.php:1959
+#: ../../include/text.php:1945
msgid "comment"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Tagger.php:95
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+#: ../../Zotlabs/Module/Item.php:184
+msgid "Unable to locate original post."
msgstr ""
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
+#: ../../Zotlabs/Module/Item.php:450
+msgid "Empty post discarded."
msgstr ""
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
+#: ../../Zotlabs/Module/Item.php:824
+msgid "Duplicate post suppressed."
msgstr ""
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please "
-"leave this page unless you are comfortable with and knowledgeable about how "
-"to correctly use this feature."
+#: ../../Zotlabs/Module/Item.php:954
+msgid "System error. Post not saved."
msgstr ""
-#: ../../Zotlabs/Module/Group.php:24
-msgid "Privacy group created."
+#: ../../Zotlabs/Module/Item.php:1084
+msgid "Unable to obtain post information from database."
msgstr ""
-#: ../../Zotlabs/Module/Group.php:30
-msgid "Could not create privacy group."
+#: ../../Zotlabs/Module/Item.php:1091
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Item.php:1098
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+=======
#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3947
+#: ../../include/items.php:3922
msgid "Privacy group not found."
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Group.php:58
-msgid "Privacy group updated."
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
msgstr ""
-#: ../../Zotlabs/Module/Group.php:90
-msgid "Create a group of channels."
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
msgstr ""
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
-msgid "Privacy group name: "
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#, php-format
+msgid "Site Member (%s)"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
-msgid "Members are visible to other channels"
+#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#, php-format
+msgid "Password reset requested at %s"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:111
-msgid "Privacy group removed."
+#: ../../Zotlabs/Module/Lostpass.php:68
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
msgstr ""
-#: ../../Zotlabs/Module/Group.php:113
-msgid "Unable to remove privacy group."
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1599
+msgid "Password Reset"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:183
-msgid "Privacy group editor"
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your password has been reset as requested."
msgstr ""
-#: ../../Zotlabs/Module/Group.php:197 ../../Zotlabs/Module/Help.php:81
-msgid "Members"
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Your new password is"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:199
-msgid "All Connected Channels"
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "Save or copy your new password - and then"
msgstr ""
-#: ../../Zotlabs/Module/Group.php:231
-msgid "Click on a channel to add or remove."
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid "click here to login"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
-#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659
-msgid "Profile not found."
+#: ../../Zotlabs/Module/Lostpass.php:96
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:44
-msgid "Profile deleted."
+#: ../../Zotlabs/Module/Lostpass.php:117
+#, php-format
+msgid "Your password has changed at %s"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
-msgid "Profile-"
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Forgot your Password?"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
-msgid "New profile created."
+#: ../../Zotlabs/Module/Lostpass.php:131
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:111
-msgid "Profile unavailable to clone."
+#: ../../Zotlabs/Module/Lostpass.php:132
+msgid "Email Address"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:146
-msgid "Profile unavailable to export."
+#: ../../Zotlabs/Module/Lostpass.php:133
+msgid "Reset"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:252
-msgid "Profile Name is required."
+#: ../../Zotlabs/Module/Rbmark.php:94
+msgid "Select a bookmark folder"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:459
-msgid "Marital Status"
+#: ../../Zotlabs/Module/Rbmark.php:99
+msgid "Save Bookmark"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:463
-msgid "Romantic Partner"
+#: ../../Zotlabs/Module/Rbmark.php:100
+msgid "URL of bookmark"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775
-msgid "Likes"
+#: ../../Zotlabs/Module/Rbmark.php:105
+msgid "Or enter new bookmark folder name"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Follow.php:31
+msgid "Channel added."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783
-msgid "Work/Employment"
+#: ../../Zotlabs/Module/Regmod.php:15
+msgid "Please login."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:478
-msgid "Religion"
+#: ../../Zotlabs/Module/Removeaccount.php:35
+msgid ""
+"Account removals are not allowed within 48 hours of changing the account "
+"password."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:482
-msgid "Political Views"
+#: ../../Zotlabs/Module/Removeaccount.php:57
+msgid "Remove This Account"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:486
-#: ../../addon/openid/MysqlProvider.php:74
-msgid "Gender"
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "WARNING: "
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:490
-msgid "Sexual Preference"
+#: ../../Zotlabs/Module/Removeaccount.php:58
+msgid ""
+"This account and all its channels will be completely removed from the "
+"network. "
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:494
-msgid "Homepage"
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "This action is permanent and can not be undone!"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:498
-msgid "Interests"
+#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeme.php:62
+msgid "Please enter your password for verification:"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:594
-msgid "Profile updated."
+#: ../../Zotlabs/Module/Removeaccount.php:60
+msgid ""
+"Remove this account, all its channels and all its channel clones from the "
+"network"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:678
-msgid "Hide your connections list from viewers of this profile"
+#: ../../Zotlabs/Module/Removeaccount.php:60
+msgid ""
+"By default only the instances of the channels located on this hub will be "
+"removed from the network"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:725
-msgid "Edit Profile Details"
+#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Settings/Account.php:120
+msgid "Remove Account"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:727
-msgid "View this profile"
+#: ../../Zotlabs/Module/Pdledit.php:21
+msgid "Layout updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:217
+msgid "Feature disabled."
msgstr ""
+#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69
+msgid "Edit System Page Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:64
+msgid "Layout not found."
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Pdledit.php:70
+msgid "Module Name:"
+=======
#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
-#: ../../include/channel.php:1080
+#: ../../include/channel.php:1066
msgid "Edit visibility"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Profile Tools"
+#: ../../Zotlabs/Module/Pdledit.php:71
+msgid "Layout Help"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:730
-msgid "Change cover photo"
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1051
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Profperm.php:111
+msgid "Profile Visibility Editor"
+=======
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
msgid "Change profile photo"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:732
-msgid "Create a new profile using these settings"
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1341
+msgid "Profile"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:733
-msgid "Clone this profile"
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Click on a contact to add or remove."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Delete this profile"
+#: ../../Zotlabs/Module/Profperm.php:124
+msgid "Visible To"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Add profile things"
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1655
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
+=======
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1657
msgid "Personal"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:738
-msgid "Relation"
+#: ../../Zotlabs/Module/Events.php:110
+msgid "Event can not end before it has started."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55
-msgid "Miscellaneous"
+#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
+#: ../../Zotlabs/Module/Events.php:143
+msgid "Unable to generate preview."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "Import profile from file"
+#: ../../Zotlabs/Module/Events.php:119
+msgid "Event title and start time are required."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:742
-msgid "Export profile to file"
+#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
+msgid "Event not found."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:743
-msgid "Your gender"
+#: ../../Zotlabs/Module/Events.php:460
+msgid "Edit event title"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:744
-msgid "Marital status"
+#: ../../Zotlabs/Module/Events.php:460
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
+msgid "Event title"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:745
-msgid "Sexual preference"
+#: ../../Zotlabs/Module/Events.php:462
+msgid "Categories (comma-separated list)"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:748
-msgid "Profile name"
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Category"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:750
-msgid "This is your default profile."
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Category"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:752
-msgid "Your full name"
+#: ../../Zotlabs/Module/Events.php:466
+msgid "Edit start date and time"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:753
-msgid "Title/Description"
+#: ../../Zotlabs/Module/Events.php:466
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
+msgid "Start date and time"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:756
-msgid "Street address"
+#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
+msgid "Finish date and time are not known or not relevant"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:757
-msgid "Locality/City"
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Edit finish date and time"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:758
-msgid "Region/State"
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Finish date and time"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:759
-msgid "Postal/Zip code"
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
+msgid "Adjust for viewer timezone"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:765
-msgid "Who (if applicable)"
+#: ../../Zotlabs/Module/Events.php:471
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:765
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../Zotlabs/Module/Events.php:473
+msgid "Edit Description"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:766
-msgid "Since (date)"
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Edit Location"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:769
-msgid "Tell us about yourself"
+#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1343
+msgid "Permission settings"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:770
-#: ../../addon/openid/MysqlProvider.php:68
-msgid "Homepage URL"
+#: ../../Zotlabs/Module/Events.php:489
+msgid "Timezone:"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:771
-msgid "Hometown"
+#: ../../Zotlabs/Module/Events.php:494
+msgid "Advanced Options"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:772
-msgid "Political views"
+#: ../../Zotlabs/Module/Events.php:633
+msgid "Edit event"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:773
-msgid "Religious views"
+#: ../../Zotlabs/Module/Events.php:635
+msgid "Delete event"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:774
-msgid "Keywords used in directory listings"
+#: ../../Zotlabs/Module/Events.php:669
+msgid "calendar"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:774
-msgid "Example: fishing photography software"
+#: ../../Zotlabs/Module/Events.php:695
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849
+msgid "Month"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:777
-msgid "Musical interests"
+#: ../../Zotlabs/Module/Events.php:696
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850
+msgid "Week"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Books, literature"
+#: ../../Zotlabs/Module/Events.php:697
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851
+msgid "Day"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:779
-msgid "Television"
+#: ../../Zotlabs/Module/Events.php:731
+msgid "Event removed"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:780
-msgid "Film/Dance/Culture/Entertainment"
+#: ../../Zotlabs/Module/Events.php:734
+msgid "Failed to remove event"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:781
-msgid "Hobbies/Interests"
+#: ../../Zotlabs/Module/Service_limits.php:23
+msgid "No service class restrictions found."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:782
-msgid "Love/Romance"
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:784
-msgid "School/Education"
+#: ../../Zotlabs/Module/Bookmarks.php:76
+msgid "My Bookmarks"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:785
-msgid "Contact information and social networks"
+#: ../../Zotlabs/Module/Bookmarks.php:87
+msgid "My Connections Bookmarks"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:786
-msgid "My other channels"
+#: ../../Zotlabs/Module/Removeme.php:35
+msgid ""
+"Channel removals are not allowed within 48 hours of changing the account "
+"password."
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:788
-msgid "Communications"
+#: ../../Zotlabs/Module/Removeme.php:60
+msgid "Remove This Channel"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "This channel will be completely removed from the network. "
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeme.php:63
+msgid "Remove this channel and all its clones from the network"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1076
+#: ../../Zotlabs/Module/Removeme.php:63
+msgid ""
+"By default only the instance of the channel located on this hub will be "
+"removed from the network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeme.php:64
+#: ../../Zotlabs/Module/Settings/Channel.php:575
+msgid "Remove Channel"
+=======
+#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
msgid "Profile Image"
msgstr ""
-#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1058
+#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1044
#: ../../include/nav.php:109
msgid "Edit Profiles"
msgstr ""
@@ -5863,12 +6892,45 @@ msgstr ""
#: ../../Zotlabs/Module/Editwebpage.php:166
msgid "Edit Webpage"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Manage.php:143
-msgid "Create a new channel"
+#: ../../Zotlabs/Module/Sharedwithme.php:99
+msgid "Files: shared with me"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Sharedwithme.php:101
+msgid "NEW"
+msgstr ""
+
+#: ../../Zotlabs/Module/Sharedwithme.php:104
+msgid "Remove all files"
+msgstr ""
+
+#: ../../Zotlabs/Module/Sharedwithme.php:105
+msgid "Remove this file"
msgstr ""
+#: ../../Zotlabs/Module/Viewsrc.php:46
+msgid "Source of Item"
+msgstr ""
+
+#: ../../Zotlabs/Module/Sources.php:37
+msgid "Failed to create source. No channel selected."
+msgstr ""
+
+#: ../../Zotlabs/Module/Sources.php:51
+msgid "Source created."
+msgstr ""
+
+#: ../../Zotlabs/Module/Sources.php:64
+msgid "Source updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Sources.php:90
+msgid "*"
+=======
#: ../../Zotlabs/Module/Manage.php:168 ../../Zotlabs/Lib/Apps.php:221
#: ../../include/nav.php:205
msgid "Channel Manager"
@@ -5902,1203 +6964,1391 @@ msgstr ""
#: ../../Zotlabs/Module/Manage.php:179
msgid "Delegated Channel"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Dirsearch.php:33
-msgid "This directory server requires an access token"
+#: ../../Zotlabs/Module/Sources.php:96
+#: ../../Zotlabs/Widget/Settings_menu.php:123 ../../include/features.php:213
+msgid "Channel Sources"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:20
-msgid "About this site"
+#: ../../Zotlabs/Module/Sources.php:97
+msgid "Manage remote sources of content for your channel."
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:21
-msgid "Site Name"
+#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
+msgid "New Source"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+=======
#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:2025
msgid "Administrator"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:27 ../../Zotlabs/Module/Register.php:221
-msgid "Terms of Service"
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+msgid "Only import content with these words (one per line)"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:28
-msgid "Software and Project information"
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+msgid "Leave blank to import all public content"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:29
-msgid "This site is powered by $Projectname"
+#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
+msgid "Channel Name"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:30
+#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
msgid ""
-"Federated and decentralised networking and identity services provided by Zot"
+"Add the following categories to posts imported from this source (comma "
+"separated)"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:32
-#, php-format
-msgid "Version %s"
+#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+#: ../../Zotlabs/Module/Settings/Oauth.php:93
+msgid "Optional"
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:33
-msgid "Project homepage"
+#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
+msgid "Source not found."
msgstr ""
-#: ../../Zotlabs/Module/Siteinfo.php:34
-msgid "Developer homepage"
+#: ../../Zotlabs/Module/Sources.php:140
+msgid "Edit Source"
msgstr ""
-#: ../../Zotlabs/Module/Ratings.php:70
-msgid "No ratings"
+#: ../../Zotlabs/Module/Sources.php:141
+msgid "Delete Source"
msgstr ""
-#: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35
-#: ../../include/conversation.php:1030
-msgid "Ratings"
+#: ../../Zotlabs/Module/Sources.php:169
+msgid "Source removed"
msgstr ""
-#: ../../Zotlabs/Module/Ratings.php:98
-msgid "Rating: "
+#: ../../Zotlabs/Module/Sources.php:171
+msgid "Unable to remove source."
msgstr ""
-#: ../../Zotlabs/Module/Ratings.php:99
-msgid "Website: "
+#: ../../Zotlabs/Module/Mail.php:65
+msgid "Unable to lookup recipient."
msgstr ""
-#: ../../Zotlabs/Module/Ratings.php:101
-msgid "Description: "
+#: ../../Zotlabs/Module/Mail.php:72
+msgid "Unable to communicate with requested channel."
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:52
-msgid "Import Webpage Elements"
+#: ../../Zotlabs/Module/Mail.php:79
+msgid "Cannot verify requested channel."
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:53
-msgid "Import selected"
+#: ../../Zotlabs/Module/Mail.php:97
+msgid "Selected channel has private message restrictions. Send failed."
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:76
-msgid "Export Webpage Elements"
+#: ../../Zotlabs/Module/Mail.php:178
+msgid "Messages"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:77
-msgid "Export selected"
+#: ../../Zotlabs/Module/Mail.php:213
+msgid "Message recalled."
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/conversation.php:1839 ../../include/nav.php:442
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Conversation removed."
+=======
+#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/conversation.php:1841 ../../include/nav.php:449
msgid "Webpages"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:255 ../../include/page_widgets.php:44
-msgid "Actions"
+#: ../../Zotlabs/Module/Mail.php:240 ../../Zotlabs/Module/Mail.php:361
+#: ../../Zotlabs/Module/Chat.php:203 ../../include/conversation.php:1263
+msgid "Please enter a link URL:"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:256 ../../include/page_widgets.php:45
-msgid "Page Link"
+#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:362
+msgid "Expires YYYY-MM-DD HH:MM"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:257
-msgid "Page Title"
+#: ../../Zotlabs/Module/Mail.php:269
+msgid "Requested channel is not in this network"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:287
-msgid "Invalid file type."
+#: ../../Zotlabs/Module/Mail.php:277
+msgid "Send Private Message"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:299
-msgid "Error opening zip file"
+#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:415
+msgid "To:"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:310
-msgid "Invalid folder path."
+#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:417
+msgid "Subject:"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:337
-msgid "No webpage elements detected."
+#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:423
+#: ../../include/conversation.php:1323
+msgid "Attach file"
msgstr ""
-#: ../../Zotlabs/Module/Webpages.php:412
-msgid "Import complete."
+#: ../../Zotlabs/Module/Mail.php:288
+msgid "Send"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:428
+#: ../../include/conversation.php:1368
+msgid "Set expiration date"
msgstr ""
+#: ../../Zotlabs/Module/Mail.php:293 ../../Zotlabs/Module/Mail.php:430
+#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Lib/ThreadItem.php:744
+#: ../../include/conversation.php:1373
+msgid "Encrypt text"
+=======
#: ../../Zotlabs/Module/Editpost.php:38
msgid "Item is not editable"
msgstr ""
#: ../../Zotlabs/Module/Editpost.php:103 ../../Zotlabs/Module/Rpost.php:138
msgid "Edit post"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:45
-msgid "Invalid message"
+#: ../../Zotlabs/Module/Mail.php:387
+msgid "Delete message"
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "no results"
+#: ../../Zotlabs/Module/Mail.php:388
+msgid "Delivery report"
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:93
-msgid "channel sync processed"
+#: ../../Zotlabs/Module/Mail.php:389
+msgid "Recall message"
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "queued"
+#: ../../Zotlabs/Module/Mail.php:391
+msgid "Message has been recalled."
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:101
-msgid "posted"
+#: ../../Zotlabs/Module/Mail.php:408
+msgid "Delete Conversation"
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:105
-msgid "accepted for delivery"
+#: ../../Zotlabs/Module/Mail.php:410
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:109
-msgid "updated"
+#: ../../Zotlabs/Module/Mail.php:414
+msgid "Send Reply"
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:112
-msgid "update ignored"
+#: ../../Zotlabs/Module/Mail.php:419
+#, php-format
+msgid "Your message for %s (%s):"
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:115
-msgid "permission denied"
+#: ../../Zotlabs/Module/Suggest.php:37
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:119
-msgid "recipient not found"
+#: ../../Zotlabs/Module/Suggest.php:56 ../../Zotlabs/Widget/Suggestions.php:46
+msgid "Ignore/Hide"
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:122
-msgid "mail recalled"
+#: ../../Zotlabs/Module/Rmagic.php:35
+msgid "Authentication failed."
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:125
-msgid "duplicate mail received"
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1963
+msgid "Remote Authentication"
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:128
-msgid "mail delivered"
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1964
+msgid "Enter your channel address (e.g. channel@example.com)"
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:148
-#, php-format
-msgid "Delivery report for %1$s"
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1965
+msgid "Authenticate"
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:151
-msgid "Options"
+#: ../../Zotlabs/Module/Settings/Features.php:45
+msgid "Additional Features"
msgstr ""
-#: ../../Zotlabs/Module/Dreport.php:152
-msgid "Redeliver"
+#: ../../Zotlabs/Module/Settings/Oauth.php:34
+msgid "Name is required"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:37
-msgid "Failed to create source. No channel selected."
+#: ../../Zotlabs/Module/Settings/Oauth.php:38
+msgid "Key and Secret are required"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:51
-msgid "Source created."
+#: ../../Zotlabs/Module/Settings/Oauth.php:86
+#: ../../Zotlabs/Module/Settings/Oauth.php:112
+#: ../../Zotlabs/Module/Settings/Oauth.php:148
+msgid "Add application"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:64
-msgid "Source updated."
+#: ../../Zotlabs/Module/Settings/Oauth.php:89
+msgid "Name of application"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:90
-msgid "*"
+#: ../../Zotlabs/Module/Settings/Oauth.php:90
+#: ../../Zotlabs/Module/Settings/Oauth.php:116
+#: ../../extend/addon/addon/statusnet/statusnet.php:893
+#: ../../extend/addon/addon/twitter/twitter.php:775
+msgid "Consumer Key"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:96
-#: ../../Zotlabs/Widget/Settings_menu.php:123 ../../include/features.php:213
-msgid "Channel Sources"
+#: ../../Zotlabs/Module/Settings/Oauth.php:90
+#: ../../Zotlabs/Module/Settings/Oauth.php:91
+msgid "Automatically generated - change if desired. Max length 20"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:97
-msgid "Manage remote sources of content for your channel."
+#: ../../Zotlabs/Module/Settings/Oauth.php:91
+#: ../../Zotlabs/Module/Settings/Oauth.php:117
+#: ../../extend/addon/addon/statusnet/statusnet.php:892
+#: ../../extend/addon/addon/twitter/twitter.php:776
+msgid "Consumer Secret"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
-msgid "New Source"
+#: ../../Zotlabs/Module/Settings/Oauth.php:92
+#: ../../Zotlabs/Module/Settings/Oauth.php:118
+msgid "Redirect"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
+#: ../../Zotlabs/Module/Settings/Oauth.php:92
msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
+"Redirect URI - leave blank unless your application specifically requires this"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
-msgid "Only import content with these words (one per line)"
+#: ../../Zotlabs/Module/Settings/Oauth.php:93
+#: ../../Zotlabs/Module/Settings/Oauth.php:119
+msgid "Icon url"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
-msgid "Leave blank to import all public content"
+#: ../../Zotlabs/Module/Settings/Oauth.php:104
+msgid "Application not found."
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
-msgid "Channel Name"
+#: ../../Zotlabs/Module/Settings/Oauth.php:147
+msgid "Connected Apps"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
-msgid ""
-"Add the following categories to posts imported from this source (comma "
-"separated)"
+#: ../../Zotlabs/Module/Settings/Oauth.php:151
+msgid "Client key starts with"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
-msgid "Source not found."
+#: ../../Zotlabs/Module/Settings/Oauth.php:152
+msgid "No name"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:140
-msgid "Edit Source"
+#: ../../Zotlabs/Module/Settings/Oauth.php:153
+msgid "Remove authorization"
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:141
-msgid "Delete Source"
+#: ../../Zotlabs/Module/Settings/Account.php:20
+msgid "Not valid email."
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:169
-msgid "Source removed"
+#: ../../Zotlabs/Module/Settings/Account.php:23
+msgid "Protected email address. Cannot change to that email."
msgstr ""
-#: ../../Zotlabs/Module/Sources.php:171
-msgid "Unable to remove source."
+#: ../../Zotlabs/Module/Settings/Account.php:32
+msgid "System failure storing new email. Please try again."
msgstr ""
-#: ../../Zotlabs/Module/Like.php:19
-msgid "Like/Dislike"
+#: ../../Zotlabs/Module/Settings/Account.php:40
+msgid "Technical skill level updated"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:24
-msgid "This action is restricted to members."
+#: ../../Zotlabs/Module/Settings/Account.php:56
+msgid "Password verification failed."
msgstr ""
-#: ../../Zotlabs/Module/Like.php:25
-msgid ""
-"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
-"\"register\">register as a new $Projectname member</a> to continue."
+#: ../../Zotlabs/Module/Settings/Account.php:63
+msgid "Passwords do not match. Password unchanged."
msgstr ""
-#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
-#: ../../Zotlabs/Module/Like.php:169
-msgid "Invalid request."
+#: ../../Zotlabs/Module/Settings/Account.php:67
+msgid "Empty passwords are not allowed. Password unchanged."
msgstr ""
-#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:122
-msgid "channel"
+#: ../../Zotlabs/Module/Settings/Account.php:81
+msgid "Password changed."
msgstr ""
-#: ../../Zotlabs/Module/Like.php:146
-msgid "thing"
+#: ../../Zotlabs/Module/Settings/Account.php:83
+msgid "Password update failed. Please try again."
msgstr ""
-#: ../../Zotlabs/Module/Like.php:192
-msgid "Channel unavailable."
+#: ../../Zotlabs/Module/Settings/Account.php:112
+msgid "Account Settings"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:240
-msgid "Previous action reversed."
+#: ../../Zotlabs/Module/Settings/Account.php:113
+msgid "Current Password"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:423 ../../addon/diaspora/inbound.php:1811
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Settings/Account.php:114
+msgid "Enter New Password"
+=======
+#: ../../Zotlabs/Module/Like.php:419 ../../addon/diaspora/inbound.php:1812
#: ../../include/conversation.php:160
#, php-format
msgid "%1$s likes %2$s's %3$s"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Like.php:425 ../../include/conversation.php:163
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../Zotlabs/Module/Settings/Account.php:115
+msgid "Confirm New Password"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:427
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
+#: ../../Zotlabs/Module/Settings/Account.php:115
+msgid "Leave password fields blank unless changing"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:429
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
+#: ../../Zotlabs/Module/Settings/Account.php:116
+msgid "Your technical skill level"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:431
-#, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
+#: ../../Zotlabs/Module/Settings/Account.php:116
+msgid "Used to provide a member experience matched to your comfort level"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:433
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
+#: ../../Zotlabs/Module/Settings/Account.php:119
+#: ../../Zotlabs/Module/Settings/Channel.php:483
+msgid "Email Address:"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:435
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
+#: ../../Zotlabs/Module/Settings/Account.php:121
+msgid "Remove this account including all its channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:145
+msgid "No special theme for mobile devices"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:437
+#: ../../Zotlabs/Module/Settings/Display.php:148
#, php-format
-msgid "%1$s may attend %2$s's %3$s"
+msgid "%s - (Experimental)"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:542
-msgid "Action completed."
+#: ../../Zotlabs/Module/Settings/Display.php:198
+msgid "Display Settings"
msgstr ""
-#: ../../Zotlabs/Module/Like.php:543
-msgid "Thank you."
+#: ../../Zotlabs/Module/Settings/Display.php:199
+msgid "Theme Settings"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:245
-#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Settings/Display.php:200
+msgid "Custom Theme Settings"
+msgstr ""
-#: ../../Zotlabs/Module/Directory.php:256
-msgid "Gender: "
+#: ../../Zotlabs/Module/Settings/Display.php:201
+msgid "Content Settings"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:258
-msgid "Status: "
+#: ../../Zotlabs/Module/Settings/Display.php:207
+msgid "Display Theme:"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:260
-msgid "Homepage: "
+#: ../../Zotlabs/Module/Settings/Display.php:208
+msgid "Select scheme"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1307
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Settings/Display.php:210
+msgid "Mobile Theme:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:211
+msgid "Preload images before rendering the page"
+=======
+#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1293
msgid "Age:"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:314 ../../include/markdown.php:496
-#: ../../include/channel.php:1148 ../../include/event.php:52
+#: ../../Zotlabs/Module/Directory.php:314 ../../include/markdown.php:560
+#: ../../include/channel.php:1134 ../../include/event.php:52
#: ../../include/event.php:84
msgid "Location:"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:320
-msgid "Description:"
+#: ../../Zotlabs/Module/Settings/Display.php:211
+msgid ""
+"The subjective page load time will be longer but the page will be ready when "
+"displayed"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Settings/Display.php:212
+msgid "Enable user zoom on mobile devices"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:213
+msgid "Update browser every xx seconds"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1323
+#: ../../Zotlabs/Module/Settings/Display.php:213
+msgid "Minimum of 10 seconds, no maximum"
+=======
+#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1309
msgid "Hometown:"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1331
+#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1317
msgid "About:"
msgstr ""
#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54
#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
-#: ../../include/conversation.php:1000 ../../include/channel.php:1133
-#: ../../include/connections.php:111
+#: ../../include/conversation.php:1002 ../../include/channel.php:1119
+#: ../../include/connections.php:110
msgid "Connect"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:329
-msgid "Public Forum:"
+#: ../../Zotlabs/Module/Settings/Display.php:214
+msgid "Maximum number of conversations to load at any time:"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:332
-msgid "Keywords: "
+#: ../../Zotlabs/Module/Settings/Display.php:214
+msgid "Maximum of 100 items"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:335
-msgid "Don't suggest"
+#: ../../Zotlabs/Module/Settings/Display.php:215
+msgid "Show emoticons (smilies) as images"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:337
-msgid "Common connections:"
+#: ../../Zotlabs/Module/Settings/Display.php:216
+msgid "Manual conversation updates"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Global Directory"
+#: ../../Zotlabs/Module/Settings/Display.php:216
+msgid "Default is on, turning this off may increase screen jumping"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Local Directory"
+#: ../../Zotlabs/Module/Settings/Display.php:217
+msgid "Link post titles to source"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:392
-msgid "Finding:"
+#: ../../Zotlabs/Module/Settings/Display.php:218
+msgid "System Page Layout Editor - (advanced)"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62
-#: ../../include/contact_widgets.php:24
-msgid "Channel Suggestions"
+#: ../../Zotlabs/Module/Settings/Display.php:221
+msgid "Use blog/list mode on channel page"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "next page"
+#: ../../Zotlabs/Module/Settings/Display.php:221
+#: ../../Zotlabs/Module/Settings/Display.php:222
+msgid "(comments displayed separately)"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "previous page"
+#: ../../Zotlabs/Module/Settings/Display.php:222
+msgid "Use blog/list mode on grid page"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:398
-msgid "Sort options"
+#: ../../Zotlabs/Module/Settings/Display.php:223
+msgid "Channel page max height of content (in pixels)"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:399
-msgid "Alphabetic"
+#: ../../Zotlabs/Module/Settings/Display.php:223
+#: ../../Zotlabs/Module/Settings/Display.php:224
+msgid "click to expand content exceeding this height"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:400
-msgid "Reverse Alphabetic"
+#: ../../Zotlabs/Module/Settings/Display.php:224
+msgid "Grid page max height of content (in pixels)"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:401
-msgid "Newest to Oldest"
+#: ../../Zotlabs/Module/Settings/Featured.php:20
+msgid "Affinity Slider settings updated."
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:402
-msgid "Oldest to Newest"
+#: ../../Zotlabs/Module/Settings/Featured.php:34
+msgid "No feature settings configured"
msgstr ""
-#: ../../Zotlabs/Module/Directory.php:419
-msgid "No entries (some entries may be hidden)."
+#: ../../Zotlabs/Module/Settings/Featured.php:41
+msgid "Default maximum affinity level"
msgstr ""
-#: ../../Zotlabs/Module/Xchan.php:10
-msgid "Xchan Lookup"
+#: ../../Zotlabs/Module/Settings/Featured.php:46
+msgid "Default minimum affinity level"
msgstr ""
-#: ../../Zotlabs/Module/Xchan.php:13
-msgid "Lookup xchan beginning with (or webbie): "
+#: ../../Zotlabs/Module/Settings/Featured.php:50
+msgid "Affinity Slider Settings"
msgstr ""
-#: ../../Zotlabs/Module/Suggest.php:37
+#: ../../Zotlabs/Module/Settings/Featured.php:60
+msgid "Feature/Addon Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:31
+#, php-format
+msgid "This channel is limited to %d tokens"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:37
+msgid "Name and Password are required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:77
+msgid "Token saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:113
msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+"Use this form to create temporary access identifiers to share things with "
+"non-members. These identities may be used in Access Control Lists and "
+"visitors may login using these credentials to access private content."
msgstr ""
-#: ../../Zotlabs/Module/Suggest.php:56 ../../Zotlabs/Widget/Suggestions.php:46
-msgid "Ignore/Hide"
+#: ../../Zotlabs/Module/Settings/Tokens.php:115
+msgid ""
+"You may also provide <em>dropbox</em> style access links to friends and "
+"associates by adding the Login Password to any specific site URL as shown. "
+"Examples:"
msgstr ""
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
+#: ../../Zotlabs/Module/Settings/Tokens.php:150
+#: ../../Zotlabs/Widget/Settings_menu.php:90
+msgid "Guest Access Tokens"
msgstr ""
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
+#: ../../Zotlabs/Module/Settings/Tokens.php:157
+msgid "Login Name"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:73
-msgid "Unable to lookup recipient."
+#: ../../Zotlabs/Module/Settings/Tokens.php:158
+msgid "Login Password"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:80
-msgid "Unable to communicate with requested channel."
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Settings/Tokens.php:159
+msgid "Expires (yyyy-mm-dd)"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:87
-msgid "Cannot verify requested channel."
+#: ../../Zotlabs/Module/Settings/Channel.php:251
+#: ../../extend/addon/addon/logrot/logrot.php:54
+#: ../../extend/addon/addon/msgfooter/msgfooter.php:54
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:184
+#: ../../extend/addon/addon/piwik/piwik.php:116
+#: ../../extend/addon/addon/twitter/twitter.php:766
+#: ../../extend/addon/addon/xmpp/xmpp.php:102
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:82
+msgid "Settings updated."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:105
-msgid "Selected channel has private message restrictions. Send failed."
+#: ../../Zotlabs/Module/Settings/Channel.php:312
+msgid "Nobody except yourself"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:160
-msgid "Messages"
+#: ../../Zotlabs/Module/Settings/Channel.php:313
+msgid "Only those you specifically allow"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:314
+msgid "Approved connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:315
+msgid "Any connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:316
+msgid "Anybody on this website"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:317
+msgid "Anybody in this network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:318
+msgid "Anybody authenticated"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:319
+msgid "Anybody on the internet"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:173
+#: ../../Zotlabs/Module/Settings/Channel.php:395
+msgid "Publish your default profile in the network directory"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:400
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:409
+msgid "Your channel address is"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:412
+msgid "Your files/photos are accessible via WebDAV at"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:474
+msgid "Channel Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:481
+msgid "Basic Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:482
+#: ../../include/channel.php:1229
+msgid "Full Name:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:484
+msgid "Your Timezone:"
+=======
+#: ../../Zotlabs/Module/Mail.php:191
msgid "message"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:214
+#: ../../Zotlabs/Module/Mail.php:232
msgid "Message recalled."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:227
+#: ../../Zotlabs/Module/Mail.php:245
msgid "Conversation removed."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363
+#: ../../Zotlabs/Module/Mail.php:260 ../../Zotlabs/Module/Mail.php:381
msgid "Expires YYYY-MM-DD HH:MM"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:270
+#: ../../Zotlabs/Module/Mail.php:288
msgid "Requested channel is not in this network"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:278
+#: ../../Zotlabs/Module/Mail.php:296
msgid "Send Private Message"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421
+#: ../../Zotlabs/Module/Mail.php:297 ../../Zotlabs/Module/Mail.php:439
msgid "To:"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423
+#: ../../Zotlabs/Module/Mail.php:300 ../../Zotlabs/Module/Mail.php:441
msgid "Subject:"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429
-#: ../../include/conversation.php:1321
+#: ../../Zotlabs/Module/Mail.php:305 ../../Zotlabs/Module/Mail.php:447
+#: ../../include/conversation.php:1323
msgid "Attach file"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:289
+#: ../../Zotlabs/Module/Mail.php:307
msgid "Send"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434
-#: ../../include/conversation.php:1366
+#: ../../Zotlabs/Module/Mail.php:310 ../../Zotlabs/Module/Mail.php:452
+#: ../../include/conversation.php:1368
msgid "Set expiration date"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:393
+#: ../../Zotlabs/Module/Mail.php:411
msgid "Delete message"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:394
+#: ../../Zotlabs/Module/Mail.php:412
msgid "Delivery report"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:395
+#: ../../Zotlabs/Module/Mail.php:413
msgid "Recall message"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:397
+#: ../../Zotlabs/Module/Mail.php:415
msgid "Message has been recalled."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:414
+#: ../../Zotlabs/Module/Mail.php:432
msgid "Delete Conversation"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:416
+#: ../../Zotlabs/Module/Mail.php:434
msgid ""
"No secure communications available. You <strong>may</strong> be able to "
"respond from the sender's profile page."
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:420
+#: ../../Zotlabs/Module/Mail.php:438
msgid "Send Reply"
msgstr ""
-#: ../../Zotlabs/Module/Mail.php:425
+#: ../../Zotlabs/Module/Mail.php:443
#, php-format
msgid "Your message for %s (%s):"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12
-msgid "Public Hubs"
+#: ../../Zotlabs/Module/Settings/Channel.php:485
+msgid "Default Post Location:"
msgstr ""
-#: ../../Zotlabs/Module/Pubsites.php:27
-msgid ""
-"The listed hubs allow public registration for the $Projectname network. All "
-"hubs in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some hubs may require subscription or "
-"provide tiered service plans. The hub itself <strong>may</strong> provide "
-"additional details."
+#: ../../Zotlabs/Module/Settings/Channel.php:485
+msgid "Geographical location to display on your posts"
msgstr ""
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Hub URL"
+#: ../../Zotlabs/Module/Settings/Channel.php:486
+msgid "Use Browser Location:"
msgstr ""
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Access Type"
+#: ../../Zotlabs/Module/Settings/Channel.php:488
+msgid "Adult Content"
msgstr ""
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Registration Policy"
+#: ../../Zotlabs/Module/Settings/Channel.php:488
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
msgstr ""
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Stats"
+#: ../../Zotlabs/Module/Settings/Channel.php:490
+msgid "Security and Privacy Settings"
msgstr ""
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Software"
+#: ../../Zotlabs/Module/Settings/Channel.php:493
+msgid "Your permissions are already configured. Click to view/adjust"
msgstr ""
-#: ../../Zotlabs/Module/Pubsites.php:48
-msgid "Rate"
+#: ../../Zotlabs/Module/Settings/Channel.php:495
+msgid "Hide my online presence"
msgstr ""
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:263
-msgid "webpage"
+#: ../../Zotlabs/Module/Settings/Channel.php:495
+msgid "Prevents displaying in your profile that you are online"
msgstr ""
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:269
-msgid "block"
+#: ../../Zotlabs/Module/Settings/Channel.php:497
+msgid "Simple Privacy Settings:"
msgstr ""
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:266
-msgid "layout"
+#: ../../Zotlabs/Module/Settings/Channel.php:498
+msgid ""
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
msgstr ""
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:272
-msgid "menu"
+#: ../../Zotlabs/Module/Settings/Channel.php:499
+msgid ""
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
msgstr ""
-#: ../../Zotlabs/Module/Impel.php:181
-#, php-format
-msgid "%s element installed"
+#: ../../Zotlabs/Module/Settings/Channel.php:500
+msgid "Private - <em>default private, never open or public</em>"
msgstr ""
-#: ../../Zotlabs/Module/Impel.php:184
-#, php-format
-msgid "%s element installation failed"
+#: ../../Zotlabs/Module/Settings/Channel.php:501
+msgid "Blocked - <em>default blocked to/from everybody</em>"
msgstr ""
-#: ../../Zotlabs/Module/Rbmark.php:94
-msgid "Select a bookmark folder"
+#: ../../Zotlabs/Module/Settings/Channel.php:503
+msgid "Allow others to tag your posts"
msgstr ""
-#: ../../Zotlabs/Module/Rbmark.php:99
-msgid "Save Bookmark"
+#: ../../Zotlabs/Module/Settings/Channel.php:503
+msgid ""
+"Often used by the community to retro-actively flag inappropriate content"
msgstr ""
-#: ../../Zotlabs/Module/Rbmark.php:100
-msgid "URL of bookmark"
+#: ../../Zotlabs/Module/Settings/Channel.php:505
+msgid "Channel Permission Limits"
msgstr ""
-#: ../../Zotlabs/Module/Rbmark.php:105
-msgid "Or enter new bookmark folder name"
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+msgid "Expire other channel content after this many days"
msgstr ""
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Enter a folder name"
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+msgid "0 or blank to use the website limit."
msgstr ""
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "or select an existing folder (doubleclick)"
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+#, php-format
+msgid "This website expires after %d days."
msgstr ""
-#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:137
-msgid "Save to Folder"
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+msgid "This website does not expire imported content."
msgstr ""
-#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
-#, php-format
-msgid "Fetching URL returns error: %1$s"
+#: ../../Zotlabs/Module/Settings/Channel.php:507
+msgid "The website limit takes precedence if lower than your limit."
msgstr ""
-#: ../../Zotlabs/Module/Register.php:49
-msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
+#: ../../Zotlabs/Module/Settings/Channel.php:508
+msgid "Maximum Friend Requests/Day:"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:55
-msgid ""
-"Please indicate acceptance of the Terms of Service. Registration failed."
+#: ../../Zotlabs/Module/Settings/Channel.php:508
+msgid "May reduce spam activity"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:89
-msgid "Passwords do not match."
+#: ../../Zotlabs/Module/Settings/Channel.php:509
+msgid "Default Access Control List (ACL)"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:131
-msgid ""
-"Registration successful. Please check your email for validation instructions."
+#: ../../Zotlabs/Module/Settings/Channel.php:511
+msgid "Use my default audience setting for the type of object published"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:137
-msgid "Your registration is pending approval by the site owner."
+#: ../../Zotlabs/Module/Settings/Channel.php:518
+msgid "Channel permissions category:"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:140
-msgid "Your registration can not be processed."
+#: ../../Zotlabs/Module/Settings/Channel.php:519
+msgid "Default Permissions Group"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:184
-msgid "Registration on this hub is disabled."
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+msgid "Maximum private messages per day from unknown people:"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:193
-msgid "Registration on this hub is by approval only."
+#: ../../Zotlabs/Module/Settings/Channel.php:525
+msgid "Useful to reduce spamming"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:194
-msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>"
+#: ../../Zotlabs/Module/Settings/Channel.php:528
+msgid "Notification Settings"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:204
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
+#: ../../Zotlabs/Module/Settings/Channel.php:529
+msgid "By default post a status message when:"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:227
-#, php-format
-msgid "I accept the %s for this website"
+#: ../../Zotlabs/Module/Settings/Channel.php:530
+msgid "accepting a friend request"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:229
-#, php-format
-msgid "I am over 13 years of age and accept the %s for this website"
+#: ../../Zotlabs/Module/Settings/Channel.php:531
+msgid "joining a forum/community"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:233
-msgid "Your email address"
+#: ../../Zotlabs/Module/Settings/Channel.php:532
+msgid "making an <em>interesting</em> profile change"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:234
-msgid "Choose a password"
+#: ../../Zotlabs/Module/Settings/Channel.php:533
+msgid "Send a notification email when:"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Please re-enter your password"
+#: ../../Zotlabs/Module/Settings/Channel.php:534
+msgid "You receive a connection request"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:236
-msgid "Please enter your invitation code"
+#: ../../Zotlabs/Module/Settings/Channel.php:535
+msgid "Your connections are confirmed"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:241
-msgid "no"
+#: ../../Zotlabs/Module/Settings/Channel.php:536
+msgid "Someone writes on your profile wall"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:241
-msgid "yes"
+#: ../../Zotlabs/Module/Settings/Channel.php:537
+msgid "Someone writes a followup comment"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:258
-msgid "Membership on this site is by invitation only."
+#: ../../Zotlabs/Module/Settings/Channel.php:538
+msgid "You receive a private message"
msgstr ""
-#: ../../Zotlabs/Module/Register.php:270 ../../boot.php:1612
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Settings/Channel.php:539
+msgid "You receive a friend suggestion"
+=======
+#: ../../Zotlabs/Module/Register.php:270 ../../boot.php:1610
#: ../../include/nav.php:149
msgid "Register"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Register.php:271
-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."
+#: ../../Zotlabs/Module/Settings/Channel.php:540
+msgid "You are tagged in a post"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:136
-#: ../../Zotlabs/Module/Cover_photo.php:186
-msgid "Cover Photos"
+#: ../../Zotlabs/Module/Settings/Channel.php:541
+msgid "You are poked/prodded/etc. in a post"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Settings/Channel.php:543
+msgid "Someone likes your post/comment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:546
+msgid "Show visual notifications including:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:548
+msgid "Unseen grid activity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:549
+msgid "Unseen channel activity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Channel.php:550
+msgid "Unseen private messages"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4328
+#: ../../Zotlabs/Module/Settings/Channel.php:550
+#: ../../Zotlabs/Module/Settings/Channel.php:555
+#: ../../Zotlabs/Module/Settings/Channel.php:556
+#: ../../Zotlabs/Module/Settings/Channel.php:557
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
+msgid "Recommended"
+=======
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4303
msgid "female"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4329
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4304
#, php-format
msgid "%1$s updated her %2$s"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4330
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4305
msgid "male"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4331
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4306
#, php-format
msgid "%1$s updated his %2$s"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4333
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4308
#, php-format
msgid "%1$s updated their %2$s"
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1769
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1759
msgid "cover photo"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Cover_photo.php:360
-msgid "Upload Cover Photo"
+#: ../../Zotlabs/Module/Settings/Channel.php:551
+msgid "Upcoming events"
msgstr ""
-#: ../../Zotlabs/Module/Help.php:23
-msgid "Documentation Search"
+#: ../../Zotlabs/Module/Settings/Channel.php:552
+msgid "Events today"
msgstr ""
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1771
-#: ../../include/nav.php:375
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Settings/Channel.php:553
+msgid "Upcoming birthdays"
+=======
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1773
+#: ../../include/nav.php:382
msgid "About"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Help.php:82
-msgid "Administrators"
+#: ../../Zotlabs/Module/Settings/Channel.php:553
+msgid "Not available in all themes"
msgstr ""
-#: ../../Zotlabs/Module/Help.php:83
-msgid "Developers"
+#: ../../Zotlabs/Module/Settings/Channel.php:554
+msgid "System (personal) notifications"
msgstr ""
-#: ../../Zotlabs/Module/Help.php:84
-msgid "Tutorials"
+#: ../../Zotlabs/Module/Settings/Channel.php:555
+msgid "System info messages"
msgstr ""
-#: ../../Zotlabs/Module/Help.php:93
-msgid "$Projectname Documentation"
+#: ../../Zotlabs/Module/Settings/Channel.php:556
+msgid "System critical alerts"
msgstr ""
-#: ../../Zotlabs/Module/Help.php:94
-msgid "Contents"
+#: ../../Zotlabs/Module/Settings/Channel.php:557
+msgid "New connections"
msgstr ""
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
-msgid "Tag removed"
+#: ../../Zotlabs/Module/Settings/Channel.php:558
+msgid "System Registrations"
msgstr ""
-#: ../../Zotlabs/Module/Tagrm.php:123
-msgid "Remove Item Tag"
+#: ../../Zotlabs/Module/Settings/Channel.php:559
+msgid ""
+"Also show new wall posts, private messages and connections under Notices"
msgstr ""
-#: ../../Zotlabs/Module/Tagrm.php:125
-msgid "Select a tag to remove: "
+#: ../../Zotlabs/Module/Settings/Channel.php:561
+msgid "Notify me of events this many days in advance"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:96
-msgid "No such group"
+#: ../../Zotlabs/Module/Settings/Channel.php:561
+msgid "Must be greater than 0"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:136
-msgid "No such channel"
+#: ../../Zotlabs/Module/Settings/Channel.php:567
+msgid "Advanced Account/Page Type Settings"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:141
-msgid "forum"
+#: ../../Zotlabs/Module/Settings/Channel.php:568
+msgid "Change the behaviour of this account for special situations"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:153
-msgid "Search Results For:"
+#: ../../Zotlabs/Module/Settings/Channel.php:570
+msgid "Miscellaneous Settings"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:221
-msgid "Privacy group is empty"
+#: ../../Zotlabs/Module/Settings/Channel.php:571
+msgid "Default photo upload folder"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:230
-msgid "Privacy group: "
+#: ../../Zotlabs/Module/Settings/Channel.php:571
+#: ../../Zotlabs/Module/Settings/Channel.php:572
+msgid "%Y - current year, %m - current month"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:256
-msgid "Invalid connection."
+#: ../../Zotlabs/Module/Settings/Channel.php:572
+msgid "Default file upload folder"
msgstr ""
-#: ../../Zotlabs/Module/Network.php:275 ../../addon/redred/redred.php:65
-msgid "Invalid channel."
+#: ../../Zotlabs/Module/Settings/Channel.php:574
+msgid "Personal menu to display in your channel pages"
msgstr ""
-#: ../../Zotlabs/Module/Acl.php:344
-msgid "network"
+#: ../../Zotlabs/Module/Settings/Channel.php:576
+msgid "Remove this channel."
msgstr ""
-#: ../../Zotlabs/Module/Acl.php:354
-msgid "RSS"
+#: ../../Zotlabs/Module/Settings/Channel.php:577
+msgid "Firefox Share $Projectname provider"
msgstr ""
-#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
-#: ../../addon/opensearch/opensearch.php:42
-msgid "$Projectname"
+#: ../../Zotlabs/Module/Settings/Channel.php:578
+msgid "Start calendar week on Monday"
msgstr ""
-#: ../../Zotlabs/Module/Home.php:92
-#, php-format
-msgid "Welcome to %s"
+#: ../../Zotlabs/Module/Settings/Permcats.php:37
+msgid "Permission category saved."
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:87
-msgid "Permission Denied."
+#: ../../Zotlabs/Module/Settings/Permcats.php:61
+msgid ""
+"Use this form to create permission rules for various classes of people or "
+"connections."
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:103
-msgid "File not found."
+#: ../../Zotlabs/Module/Settings/Permcats.php:94
+msgid "Permission Categories"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:146
-msgid "Edit file permissions"
+#: ../../Zotlabs/Module/Settings/Permcats.php:102
+msgid "Permission Name"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:159
-msgid "Set/edit permissions"
+#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+msgid "Tag removed"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:160
-msgid "Include all files and sub folders"
+#: ../../Zotlabs/Module/Tagrm.php:123
+msgid "Remove Item Tag"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:161
-msgid "Return to file list"
+#: ../../Zotlabs/Module/Tagrm.php:125
+msgid "Select a tag to remove: "
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:163
-msgid "Copy/paste this code to attach file to a post"
+#: ../../Zotlabs/Module/Thing.php:114
+msgid "Thing updated"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Copy/paste this URL to link file from a web page"
+#: ../../Zotlabs/Module/Thing.php:166
+msgid "Object store: failed"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:166
-msgid "Share this file"
+#: ../../Zotlabs/Module/Thing.php:170
+msgid "Thing added"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:167
-msgid "Show URL to this file"
+#: ../../Zotlabs/Module/Thing.php:196
+#, php-format
+msgid "OBJ: %1$s %2$s %3$s"
msgstr ""
-#: ../../Zotlabs/Module/Filestorage.php:168
-msgid "Notify your contacts about this file"
+#: ../../Zotlabs/Module/Thing.php:259
+msgid "Show Thing"
msgstr ""
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
+#: ../../Zotlabs/Module/Thing.php:266
+msgid "item not found."
msgstr ""
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
+#: ../../Zotlabs/Module/Thing.php:299
+msgid "Edit Thing"
msgstr ""
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
+#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:355
+msgid "Select a profile"
msgstr ""
-#: ../../Zotlabs/Module/Viewconnections.php:65
-msgid "No connections."
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358
+msgid "Post an activity"
msgstr ""
-#: ../../Zotlabs/Module/Viewconnections.php:78
-#, php-format
-msgid "Visit %s's profile [%s]"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358
+msgid "Only sends to viewers of the applicable profile"
msgstr ""
-#: ../../Zotlabs/Module/Viewconnections.php:107
-msgid "View Connections"
+#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:360
+msgid "Name of thing e.g. something"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:94
-msgid "# Accounts"
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:361
+msgid "URL of thing (optional)"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:95
-msgid "# blocked accounts"
+#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:362
+msgid "URL for photo of thing (optional)"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "# expired accounts"
+#: ../../Zotlabs/Module/Thing.php:353
+msgid "Add Thing to your Profile"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:97
-msgid "# expiring accounts"
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:274
+msgid "post"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:108
-msgid "# Channels"
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1951
+#: ../../include/conversation.php:146
+msgid "comment"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:109
-msgid "# primary"
+#: ../../Zotlabs/Module/Tagger.php:95
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:110
-msgid "# clones"
+#: ../../Zotlabs/Module/Viewconnections.php:65
+msgid "No connections."
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:116
-msgid "Message queues"
+#: ../../Zotlabs/Module/Viewconnections.php:78
+#, php-format
+msgid "Visit %s's profile [%s]"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:133
-msgid "Your software should be updated"
+#: ../../Zotlabs/Module/Viewconnections.php:107
+msgid "View Connections"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:138
-msgid "Summary"
+#: ../../Zotlabs/Module/Photos.php:78
+msgid "Page owner information could not be retrieved."
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:141
-msgid "Registered accounts"
+#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120
+msgid "Album not found."
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:142
-msgid "Pending registrations"
+#: ../../Zotlabs/Module/Photos.php:103
+msgid "Delete Album"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:143
-msgid "Registered channels"
+#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1023
+msgid "Delete Photo"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:144
-msgid "Active plugins"
+#: ../../Zotlabs/Module/Photos.php:501
+msgid "No photos selected"
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:145
-msgid "Version"
+#: ../../Zotlabs/Module/Photos.php:550
+msgid "Access to this item is restricted."
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:146
-msgid "Repository version (master)"
+#: ../../Zotlabs/Module/Photos.php:591
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
msgstr ""
-#: ../../Zotlabs/Module/Admin.php:147
-msgid "Repository version (dev)"
+#: ../../Zotlabs/Module/Photos.php:594
+#, php-format
+msgid "%1$.2f MB photo storage used."
msgstr ""
-#: ../../Zotlabs/Module/Service_limits.php:23
-msgid "No service class restrictions found."
+#: ../../Zotlabs/Module/Photos.php:636
+msgid "Upload Photos"
msgstr ""
-#: ../../Zotlabs/Module/Rate.php:156
-msgid "Website:"
+#: ../../Zotlabs/Module/Photos.php:640
+msgid "Enter an album name"
msgstr ""
-#: ../../Zotlabs/Module/Rate.php:159
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
+#: ../../Zotlabs/Module/Photos.php:641
+msgid "or select an existing album (doubleclick)"
msgstr ""
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Rating (this information is public)"
+#: ../../Zotlabs/Module/Photos.php:642
+msgid "Create a status post for this upload"
msgstr ""
-#: ../../Zotlabs/Module/Rate.php:161
-msgid "Optionally explain your rating (this information is public)"
+#: ../../Zotlabs/Module/Photos.php:643
+msgid "Caption (optional):"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
+#: ../../Zotlabs/Module/Photos.php:644
+msgid "Description (optional):"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
+#: ../../Zotlabs/Module/Photos.php:725
+msgid "Show Newest First"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
-#, php-format
-msgid "Site Member (%s)"
+#: ../../Zotlabs/Module/Photos.php:727
+msgid "Show Oldest First"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../Zotlabs/Module/Photos.php:751 ../../Zotlabs/Module/Photos.php:1290
+#: ../../Zotlabs/Module/Embedphotos.php:139 ../../Zotlabs/Widget/Album.php:78
+msgid "View Photo"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:68
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+#: ../../Zotlabs/Module/Photos.php:782
+#: ../../Zotlabs/Module/Embedphotos.php:155 ../../Zotlabs/Widget/Album.php:95
+msgid "Edit Album"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1639
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Photos.php:832
+msgid "Permission denied. Access to this item may be restricted."
+=======
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1637
msgid "Password Reset"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Your new password is"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "Save or copy your new password - and then"
+#: ../../Zotlabs/Module/Photos.php:834
+msgid "Photo not available"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid "click here to login"
+#: ../../Zotlabs/Module/Photos.php:892
+msgid "Use as profile photo"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:96
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
+#: ../../Zotlabs/Module/Photos.php:893
+msgid "Use as cover photo"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:117
-#, php-format
-msgid "Your password has changed at %s"
+#: ../../Zotlabs/Module/Photos.php:900
+msgid "Private Photo"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Forgot your Password?"
+#: ../../Zotlabs/Module/Photos.php:915
+msgid "View Full Size"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:131
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+#: ../../Zotlabs/Module/Photos.php:997
+msgid "Edit photo"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:132
-msgid "Email Address"
+#: ../../Zotlabs/Module/Photos.php:999
+msgid "Rotate CW (right)"
msgstr ""
-#: ../../Zotlabs/Module/Lostpass.php:133
-msgid "Reset"
+#: ../../Zotlabs/Module/Photos.php:1000
+msgid "Rotate CCW (left)"
msgstr ""
-#: ../../Zotlabs/Module/Notifications.php:43
-#: ../../Zotlabs/Lib/ThreadItem.php:394
-msgid "Mark all seen"
+#: ../../Zotlabs/Module/Photos.php:1003
+msgid "Move photo to album"
msgstr ""
-#: ../../Zotlabs/Lib/Techlevels.php:10
-msgid "0. Beginner/Basic"
+#: ../../Zotlabs/Module/Photos.php:1004
+msgid "Enter a new album name"
msgstr ""
-#: ../../Zotlabs/Lib/Techlevels.php:11
-msgid "1. Novice - not skilled but willing to learn"
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Photos.php:1005
+msgid "or select an existing one (doubleclick)"
+=======
+#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:190
+msgid "Mark all system notifications seen"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Lib/Techlevels.php:12
-msgid "2. Intermediate - somewhat comfortable"
+#: ../../Zotlabs/Module/Photos.php:1008
+msgid "Caption"
msgstr ""
-#: ../../Zotlabs/Lib/Techlevels.php:13
-msgid "3. Advanced - very comfortable"
+#: ../../Zotlabs/Module/Photos.php:1010
+msgid "Add a Tag"
msgstr ""
-#: ../../Zotlabs/Lib/Techlevels.php:14
-msgid "4. Expert - I can write computer code"
+#: ../../Zotlabs/Module/Photos.php:1018
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
msgstr ""
-#: ../../Zotlabs/Lib/Techlevels.php:15
-msgid "5. Wizard - I probably know more than you do"
+#: ../../Zotlabs/Module/Photos.php:1021
+msgid "Flag as adult in album view"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:212
-msgid "Site Admin"
+#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:269
+msgid "I like this (toggle)"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:213 ../../addon/buglink/buglink.php:16
-msgid "Report Bug"
+#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:270
+msgid "I don't like this (toggle)"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:214
-msgid "View Bookmarks"
+#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:412
+#: ../../include/conversation.php:739
+msgid "Please wait"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:215
-msgid "My Chatrooms"
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Photos.php:1059 ../../Zotlabs/Module/Photos.php:1177
+#: ../../Zotlabs/Lib/ThreadItem.php:729
+msgid "This is you"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:217
-msgid "Firefox Share"
+#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179
+#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/js_strings.php:6
+msgid "Comment"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:218
-msgid "Remote Diagnostics"
+#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+msgctxt "title"
+msgid "Likes"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:337
-msgid "Suggest Channels"
+#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+msgctxt "title"
+msgid "Dislikes"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:220 ../../boot.php:1631 ../../include/nav.php:117
+#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+msgctxt "title"
+msgid "Agree"
+=======
+#: ../../Zotlabs/Lib/Apps.php:220 ../../boot.php:1629 ../../include/nav.php:117
msgid "Login"
msgstr ""
@@ -7106,8 +8356,8 @@ msgstr ""
msgid "Activity"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1855
-#: ../../include/features.php:99 ../../include/nav.php:458
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1857
+#: ../../include/features.php:99 ../../include/nav.php:465
msgid "Wiki"
msgstr ""
@@ -7115,58 +8365,101 @@ msgstr ""
msgid "Channel Home"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1800
-#: ../../include/conversation.php:1803 ../../include/nav.php:200
-#: ../../include/nav.php:404 ../../include/nav.php:407
+#: ../../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"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:231
-msgid "Directory"
+#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+msgctxt "title"
+msgid "Disagree"
msgstr ""
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+msgctxt "title"
+msgid "Abstain"
+=======
#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:192
msgid "Mail"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:236
-msgid "Chat"
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+msgctxt "title"
+msgid "Attending"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:238
-msgid "Probe"
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+msgctxt "title"
+msgid "Not attending"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:239
-msgid "Suggest"
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+msgctxt "title"
+msgid "Might attend"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:240
-msgid "Random Channel"
+#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1108
+#: ../../Zotlabs/Lib/ThreadItem.php:187 ../../Zotlabs/Lib/ThreadItem.php:199
+msgid "View all"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:241
-msgid "Invite"
+#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:191
+#: ../../include/taxonomy.php:403 ../../include/channel.php:1247
+#: ../../include/conversation.php:1898
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:196
+#: ../../include/conversation.php:1901
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1205
+msgid "Photo Tools"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26
-msgid "Features"
+#: ../../Zotlabs/Module/Photos.php:1214
+msgid "In This Photo:"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:243 ../../addon/openid/MysqlProvider.php:69
-msgid "Language"
+#: ../../Zotlabs/Module/Photos.php:1219
+msgid "Map"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:244
-msgid "Post"
+#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:401
+msgctxt "noun"
+msgid "Likes"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:245 ../../addon/openid/MysqlProvider.php:58
-#: ../../addon/openid/MysqlProvider.php:59
-#: ../../addon/openid/MysqlProvider.php:60
-msgid "Profile Photo"
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:402
+msgctxt "noun"
+msgid "Dislikes"
msgstr ""
+#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:407
+#: ../../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:525
+msgid "Recent Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:179
+msgid "Room not found"
+=======
#: ../../Zotlabs/Lib/Apps.php:365
msgid "Purchase"
msgstr ""
@@ -7175,34 +8468,92 @@ msgstr ""
msgid "Undelete"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:375
+#: ../../Zotlabs/Lib/Apps.php:374
msgid "Add to app-tray"
msgstr ""
-#: ../../Zotlabs/Lib/Apps.php:376
+#: ../../Zotlabs/Lib/Apps.php:375
msgid "Remove from app-tray"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Lib/Permcat.php:58
-msgctxt "permcat"
-msgid "default"
+#: ../../Zotlabs/Module/Chat.php:195
+msgid "Leave Room"
msgstr ""
-#: ../../Zotlabs/Lib/Permcat.php:96
-msgctxt "permcat"
-msgid "follower"
+#: ../../Zotlabs/Module/Chat.php:196
+msgid "Delete Room"
msgstr ""
-#: ../../Zotlabs/Lib/Permcat.php:100
-msgctxt "permcat"
-msgid "contributor"
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "I am away right now"
msgstr ""
-#: ../../Zotlabs/Lib/Permcat.php:104
-msgctxt "permcat"
-msgid "publisher"
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "I am online"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "Bookmark this room"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:230
+msgid "New Chatroom"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:231
+msgid "Chatroom name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "Expiration of chats (minutes)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:248
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:253
+msgid "No chatrooms available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:257
+msgid "Expiration"
msgstr ""
+#: ../../Zotlabs/Module/Chat.php:258
+msgid "min"
+msgstr ""
+
+#: ../../Zotlabs/Module/Xchan.php:10
+msgid "Xchan Lookup"
+msgstr ""
+
+#: ../../Zotlabs/Module/Xchan.php:13
+msgid "Lookup xchan beginning with (or webbie): "
+msgstr ""
+
+#: ../../Zotlabs/Lib/Chatroom.php:27
+msgid "Missing room name"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Chatroom.php:36
+msgid "Duplicate room name"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94
+msgid "Invalid room specifier."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Chatroom.php:126
+msgid "Room not found."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Chatroom.php:147
+msgid "Room is full"
+=======
#: ../../Zotlabs/Lib/NativeWikiPage.php:42
#: ../../Zotlabs/Lib/NativeWikiPage.php:83
msgid "(No Title)"
@@ -7267,9 +8618,10 @@ msgid "Message"
msgstr ""
#: ../../Zotlabs/Lib/NativeWikiPage.php:578
-#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:667
-#: ../../include/bbcode.php:813
+#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:610
+#: ../../include/bbcode.php:756
msgid "Different viewers will see this text differently"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
#: ../../Zotlabs/Lib/PermissionDescription.php:34
@@ -7335,26 +8687,76 @@ msgstr ""
msgid "This is your default setting for the audience of your webpages"
msgstr ""
-#: ../../Zotlabs/Lib/Chatroom.php:27
-msgid "Missing room name"
+#: ../../Zotlabs/Lib/DB_Upgrade.php:93
+#, php-format
+msgid "Update Error at %s"
msgstr ""
-#: ../../Zotlabs/Lib/Chatroom.php:36
-msgid "Duplicate room name"
+#: ../../Zotlabs/Lib/DB_Upgrade.php:99
+#, php-format
+msgid "Update %s failed. See error logs."
msgstr ""
-#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94
-msgid "Invalid room specifier."
+#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:661
+msgid "Private Message"
msgstr ""
-#: ../../Zotlabs/Lib/Chatroom.php:126
-msgid "Room not found."
+#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:653
+msgid "Select"
msgstr ""
-#: ../../Zotlabs/Lib/Chatroom.php:147
-msgid "Room is full"
+#: ../../Zotlabs/Lib/ThreadItem.php:158
+msgid "I will attend"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:158
+msgid "I will not attend"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:158
+msgid "I might attend"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:168
+msgid "I agree"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:168
+msgid "I disagree"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:168
+msgid "I abstain"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:224
+msgid "Add Star"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:225
+msgid "Remove Star"
msgstr ""
+#: ../../Zotlabs/Lib/ThreadItem.php:226
+msgid "Toggle Star Status"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Lib/ThreadItem.php:230
+msgid "starred"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:668
+msgid "Message signature validated"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:669
+msgid "Message signature incorrect"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:249
+msgid "Add Tag"
+=======
#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1977
msgid "$Projectname Notification"
msgstr ""
@@ -7372,551 +8774,565 @@ msgstr ""
#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1982
#, php-format
msgid "%s Administrator"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:116
-#, php-format
-msgid "%s <!item_type!>"
+#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:316
+msgid "like"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:120
-#, php-format
-msgid "[$Projectname:Notify] New mail received at %s"
+#: ../../Zotlabs/Lib/ThreadItem.php:270 ../../include/taxonomy.php:317
+msgid "dislike"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:122
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+#: ../../Zotlabs/Lib/ThreadItem.php:274
+msgid "Share This"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:123
-#, php-format
-msgid "%1$s sent you %2$s."
+#: ../../Zotlabs/Lib/ThreadItem.php:274
+msgid "share"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:123
-msgid "a private message"
+#: ../../Zotlabs/Lib/ThreadItem.php:283
+msgid "Delivery Report"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:124
+#: ../../Zotlabs/Lib/ThreadItem.php:301
#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr ""
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
-#: ../../Zotlabs/Lib/Enotify.php:184
+#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Lib/ThreadItem.php:331
#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgid "View %s's profile - %s"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:192
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+#: ../../Zotlabs/Lib/ThreadItem.php:334
+msgid "to"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:201
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../Zotlabs/Lib/ThreadItem.php:335
+msgid "via"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:213
-#, php-format
-msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s"
+#: ../../Zotlabs/Lib/ThreadItem.php:336
+msgid "Wall-to-Wall"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:215
-#, php-format
-msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../Zotlabs/Lib/ThreadItem.php:337
+msgid "via Wall-To-Wall:"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:216
+#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:718
#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgid "from %s"
msgstr ""
-#: ../../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
+#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:721
#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+msgid "last edited: %s"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:223 ../../Zotlabs/Lib/Enotify.php:224
+#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:722
#, php-format
-msgid "Please visit %s to approve or reject this comment."
+msgid "Expires: %s"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:282
-#, php-format
-msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
+#: ../../Zotlabs/Lib/ThreadItem.php:360
+msgid "Attend"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:297
-#, php-format
-msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
+#: ../../Zotlabs/Lib/ThreadItem.php:361
+msgid "Attendance Options"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:298
-#, php-format
-msgid "%1$s, %2$s liked an item/conversation you created."
+#: ../../Zotlabs/Lib/ThreadItem.php:362
+msgid "Vote"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:309
-#, php-format
-msgid "[$Projectname:Notify] %s posted to your profile wall"
+#: ../../Zotlabs/Lib/ThreadItem.php:363
+msgid "Voting Options"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:311
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../Zotlabs/Lib/ThreadItem.php:384
+#: ../../extend/addon/addon/bookmarker/bookmarker.php:38
+msgid "Save Bookmarks"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:313
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+#: ../../Zotlabs/Lib/ThreadItem.php:385
+msgid "Add to Calendar"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:337
-#, php-format
-msgid "[$Projectname:Notify] %s tagged you"
+#: ../../Zotlabs/Lib/ThreadItem.php:394
+msgid "Mark all seen"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:338
+#: ../../Zotlabs/Lib/ThreadItem.php:443 ../../include/js_strings.php:7
#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+msgid "%s show all"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:339
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1318
+msgid "Bold"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:351
-#, php-format
-msgid "[$Projectname:Notify] %1$s poked you"
+#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1319
+msgid "Italic"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:352
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1320
+msgid "Underline"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:353
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1321
+msgid "Quote"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:369
-#, php-format
-msgid "[$Projectname:Notify] %s tagged your post"
+#: ../../Zotlabs/Lib/ThreadItem.php:737 ../../include/conversation.php:1322
+msgid "Code"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:370
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+#: ../../Zotlabs/Lib/ThreadItem.php:738
+msgid "Image"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:371
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+#: ../../Zotlabs/Lib/ThreadItem.php:739
+msgid "Insert Link"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:383
-msgid "[$Projectname:Notify] Introduction received"
+#: ../../Zotlabs/Lib/ThreadItem.php:740
+msgid "Video"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:384
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+#: ../../Zotlabs/Lib/Permcat.php:58
+msgctxt "permcat"
+msgid "default"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:385
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+#: ../../Zotlabs/Lib/Permcat.php:96
+msgctxt "permcat"
+msgid "follower"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:389 ../../Zotlabs/Lib/Enotify.php:408
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../Zotlabs/Lib/Permcat.php:100
+msgctxt "permcat"
+msgid "contributor"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:391
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
+#: ../../Zotlabs/Lib/Permcat.php:104
+msgctxt "permcat"
+msgid "publisher"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:398
-msgid "[$Projectname:Notify] Friend suggestion received"
+#: ../../Zotlabs/Lib/Apps.php:212
+msgid "Site Admin"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:399
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+#: ../../Zotlabs/Lib/Apps.php:213
+#: ../../extend/addon/addon/buglink/buglink.php:16
+msgid "Report Bug"
msgstr ""
-#: ../../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."
+#: ../../Zotlabs/Lib/Apps.php:214
+msgid "View Bookmarks"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:406
-msgid "Name:"
+#: ../../Zotlabs/Lib/Apps.php:215
+msgid "My Chatrooms"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:407
-msgid "Photo:"
+<<<<<<< HEAD
+#: ../../Zotlabs/Lib/Apps.php:217
+msgid "Firefox Share"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:410
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../Zotlabs/Lib/Apps.php:218
+msgid "Remote Diagnostics"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:629
+#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:337
+msgid "Suggest Channels"
+=======
+#: ../../Zotlabs/Lib/Enotify.php:620
msgid "[$Projectname:Notify]"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:789
+#: ../../Zotlabs/Lib/Enotify.php:780
msgid "created a new post"
msgstr ""
-#: ../../Zotlabs/Lib/Enotify.php:790
+#: ../../Zotlabs/Lib/Enotify.php:781
#, php-format
msgid "commented on %s's post"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Lib/NativeWiki.php:128
-msgid "Wiki files deleted successfully"
+#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:113
+#: ../../boot.php:1591
+msgid "Login"
msgstr ""
-#: ../../Zotlabs/Lib/DB_Upgrade.php:93
-#, php-format
-msgid "Update Error at %s"
+#: ../../Zotlabs/Lib/Apps.php:222
+msgid "Activity"
msgstr ""
-#: ../../Zotlabs/Lib/DB_Upgrade.php:99
-#, php-format
-msgid "Update %s failed. See error logs."
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1848
+#: ../../include/features.php:99
+msgid "Wiki"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:657
-msgid "Private Message"
+#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:176
+msgid "Channel Home"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:649
-msgid "Select"
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:196
+#: ../../include/conversation.php:1793 ../../include/conversation.php:1796
+msgid "Events"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:158
-msgid "I will attend"
+#: ../../Zotlabs/Lib/Apps.php:231
+msgid "Directory"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:158
-msgid "I will not attend"
+#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:188
+msgid "Mail"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:158
-msgid "I might attend"
+#: ../../Zotlabs/Lib/Apps.php:236
+msgid "Chat"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:168
-msgid "I agree"
+#: ../../Zotlabs/Lib/Apps.php:238
+msgid "Probe"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:168
-msgid "I disagree"
+#: ../../Zotlabs/Lib/Apps.php:239
+msgid "Suggest"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:168
-msgid "I abstain"
+#: ../../Zotlabs/Lib/Apps.php:240
+msgid "Random Channel"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:224
-msgid "Add Star"
+#: ../../Zotlabs/Lib/Apps.php:241
+msgid "Invite"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:225
-msgid "Remove Star"
+#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26
+msgid "Features"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:226
-msgid "Toggle Star Status"
+#: ../../Zotlabs/Lib/Apps.php:243
+#: ../../extend/addon/addon/openid/MysqlProvider.php:69
+msgid "Language"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:230
-msgid "starred"
+#: ../../Zotlabs/Lib/Apps.php:244
+msgid "Post"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:664
-msgid "Message signature validated"
+#: ../../Zotlabs/Lib/Apps.php:245
+#: ../../extend/addon/addon/openid/MysqlProvider.php:58
+#: ../../extend/addon/addon/openid/MysqlProvider.php:59
+#: ../../extend/addon/addon/openid/MysqlProvider.php:60
+msgid "Profile Photo"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:665
-msgid "Message signature incorrect"
+#: ../../Zotlabs/Lib/Apps.php:365
+msgid "Purchase"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:249
-msgid "Add Tag"
+#: ../../Zotlabs/Lib/Apps.php:369
+msgid "Undelete"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:346
-msgid "like"
+#: ../../Zotlabs/Lib/Apps.php:374
+msgid "Add to app-tray"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:270 ../../include/taxonomy.php:347
-msgid "dislike"
+#: ../../Zotlabs/Lib/Apps.php:375
+msgid "Remove from app-tray"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:274
-msgid "Share This"
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1426
+msgid "$Projectname Notification"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:274
-msgid "share"
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1427
+msgid "$projectname"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:283
-msgid "Delivery Report"
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1429
+msgid "Thank You,"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:301
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1431
#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s Administrator"
+msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Lib/ThreadItem.php:331
+#: ../../Zotlabs/Lib/Enotify.php:116
#, php-format
-msgid "View %s's profile - %s"
+msgid "%s <!item_type!>"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:334
-msgid "to"
+#: ../../Zotlabs/Lib/Enotify.php:120
+#, php-format
+msgid "[$Projectname:Notify] New mail received at %s"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:335
-msgid "via"
+#: ../../Zotlabs/Lib/Enotify.php:122
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:336
-msgid "Wall-to-Wall"
+#: ../../Zotlabs/Lib/Enotify.php:123
+#, php-format
+msgid "%1$s sent you %2$s."
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:337
-msgid "via Wall-To-Wall:"
+#: ../../Zotlabs/Lib/Enotify.php:123
+msgid "a private message"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:716
+#: ../../Zotlabs/Lib/Enotify.php:124
#, php-format
-msgid "from %s"
+msgid "Please visit %s to view and/or reply to your private messages."
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:719
+#: ../../Zotlabs/Lib/Enotify.php:183
#, php-format
-msgid "last edited: %s"
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:720
+#: ../../Zotlabs/Lib/Enotify.php:191
#, php-format
-msgid "Expires: %s"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:360
-msgid "Attend"
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:361
-msgid "Attendance Options"
+#: ../../Zotlabs/Lib/Enotify.php:200
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:362
-msgid "Vote"
+#: ../../Zotlabs/Lib/Enotify.php:211
+#, php-format
+msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:363
-msgid "Voting Options"
+#: ../../Zotlabs/Lib/Enotify.php:212
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:384
-#: ../../addon/bookmarker/bookmarker.php:38
-msgid "Save Bookmarks"
+#: ../../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
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:385
-msgid "Add to Calendar"
+#: ../../Zotlabs/Lib/Enotify.php:273
+#, php-format
+msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:443 ../../include/js_strings.php:7
+#: ../../Zotlabs/Lib/Enotify.php:288
#, php-format
-msgid "%s show all"
+msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1316
-msgid "Bold"
+#: ../../Zotlabs/Lib/Enotify.php:289
+#, php-format
+msgid "%1$s, %2$s liked an item/conversation you created."
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1317
-msgid "Italic"
+#: ../../Zotlabs/Lib/Enotify.php:300
+#, php-format
+msgid "[$Projectname:Notify] %s posted to your profile wall"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1318
-msgid "Underline"
+#: ../../Zotlabs/Lib/Enotify.php:302
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1319
-msgid "Quote"
+#: ../../Zotlabs/Lib/Enotify.php:304
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:737 ../../include/conversation.php:1320
-msgid "Code"
+#: ../../Zotlabs/Lib/Enotify.php:328
+#, php-format
+msgid "[$Projectname:Notify] %s tagged you"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:738
-msgid "Image"
+#: ../../Zotlabs/Lib/Enotify.php:329
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:739
-msgid "Insert Link"
+#: ../../Zotlabs/Lib/Enotify.php:330
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:740
-msgid "Video"
+#: ../../Zotlabs/Lib/Enotify.php:342
+#, php-format
+msgid "[$Projectname:Notify] %1$s poked you"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:749
-msgid "Your full name (required)"
+#: ../../Zotlabs/Lib/Enotify.php:343
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:750
-msgid "Your email address (required)"
+#: ../../Zotlabs/Lib/Enotify.php:344
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
msgstr ""
-#: ../../Zotlabs/Lib/ThreadItem.php:751
-msgid "Your website URL (optional)"
+#: ../../Zotlabs/Lib/Enotify.php:360
+#, php-format
+msgid "[$Projectname:Notify] %s tagged your post"
msgstr ""
-#: ../../Zotlabs/Zot/Auth.php:138
-msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
+<<<<<<< HEAD
+#: ../../Zotlabs/Lib/Enotify.php:361
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+=======
+#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2679
+msgid "Collection"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Zot/Auth.php:250 ../../addon/openid/Mod_Openid.php:76
-#: ../../addon/openid/Mod_Openid.php:178
+#: ../../Zotlabs/Lib/Enotify.php:362
#, php-format
-msgid "Welcome %s. Remote authentication successful."
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:106 ../../Zotlabs/Storage/Browser.php:237
-msgid "parent"
+#: ../../Zotlabs/Lib/Enotify.php:374
+msgid "[$Projectname:Notify] Introduction received"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2692
-msgid "Collection"
+#: ../../Zotlabs/Lib/Enotify.php:375
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:133
-msgid "Principal"
+#: ../../Zotlabs/Lib/Enotify.php:376
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:136
-msgid "Addressbook"
+#: ../../Zotlabs/Lib/Enotify.php:380 ../../Zotlabs/Lib/Enotify.php:399
+#, php-format
+msgid "You may visit their profile at %s"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:139
-msgid "Calendar"
+#: ../../Zotlabs/Lib/Enotify.php:382
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:142
-msgid "Schedule Inbox"
+#: ../../Zotlabs/Lib/Enotify.php:389
+msgid "[$Projectname:Notify] Friend suggestion received"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:145
-msgid "Schedule Outbox"
+#: ../../Zotlabs/Lib/Enotify.php:390
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:225
-msgid "Total"
+#: ../../Zotlabs/Lib/Enotify.php:391
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:227
-msgid "Shared"
+#: ../../Zotlabs/Lib/Enotify.php:397
+msgid "Name:"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:301
-#, php-format
-msgid "You are using %1$s of your available file storage."
+#: ../../Zotlabs/Lib/Enotify.php:398
+msgid "Photo:"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:306
+#: ../../Zotlabs/Lib/Enotify.php:401
#, php-format
-msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
+msgid "Please visit %s to approve or reject the suggestion."
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:317
-msgid "WARNING:"
+#: ../../Zotlabs/Lib/Enotify.php:619
+msgid "[$Projectname:Notify]"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:327
-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>"
+#: ../../Zotlabs/Lib/Enotify.php:779
+msgid "created a new post"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:331
-msgid "Create new folder"
+#: ../../Zotlabs/Lib/Enotify.php:780
+#, php-format
+msgid "commented on %s's post"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:333
-msgid "Upload file"
+#: ../../Zotlabs/Lib/NativeWiki.php:128
+msgid "Wiki files deleted successfully"
msgstr ""
-#: ../../Zotlabs/Storage/Browser.php:347
-msgid "Drop files here to immediately upload"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:31
+#: ../../Zotlabs/Lib/NativeWikiPage.php:72
+msgid "(No Title)"
msgstr ""
-#: ../../Zotlabs/Widget/Forums.php:85
-msgid "Forums"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:86
+msgid "Wiki page create failed."
msgstr ""
-#: ../../Zotlabs/Widget/Appcategories.php:39
-#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:91
-#: ../../include/taxonomy.php:218 ../../include/taxonomy.php:300
-msgid "Categories"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:99
+msgid "Wiki not found."
msgstr ""
-#: ../../Zotlabs/Widget/Appcategories.php:42 ../../Zotlabs/Widget/Filer.php:31
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-msgid "Everything"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:110
+msgid "Destination name already exists"
msgstr ""
-#: ../../Zotlabs/Widget/Eventstools.php:13
-msgid "Events Tools"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:136
+#: ../../Zotlabs/Lib/NativeWikiPage.php:331
+msgid "Page not found"
msgstr ""
-#: ../../Zotlabs/Widget/Eventstools.php:14
-msgid "Export Calendar"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:166
+msgid "Error reading page content"
msgstr ""
-#: ../../Zotlabs/Widget/Eventstools.php:15
-msgid "Import Calendar"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:322
+#: ../../Zotlabs/Lib/NativeWikiPage.php:370
+#: ../../Zotlabs/Lib/NativeWikiPage.php:437
+#: ../../Zotlabs/Lib/NativeWikiPage.php:478
+msgid "Error reading wiki"
msgstr ""
-#: ../../Zotlabs/Widget/Suggestedchats.php:32
-msgid "Suggested Chatrooms"
+<<<<<<< HEAD
+#: ../../Zotlabs/Lib/NativeWikiPage.php:358
+msgid "Page update failed."
msgstr ""
-#: ../../Zotlabs/Widget/Mailmenu.php:13
-msgid "Private Mail Menu"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:392
+msgid "Nothing deleted"
msgstr ""
-#: ../../Zotlabs/Widget/Mailmenu.php:15
-msgid "Combined View"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:458
+msgid "Compare: object not found."
msgstr ""
+#: ../../Zotlabs/Lib/NativeWikiPage.php:464
+msgid "Page updated"
+=======
#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:195
msgid "Inbox"
msgstr ""
@@ -7930,25 +9346,30 @@ msgid "New Message"
msgstr ""
#: ../../Zotlabs/Widget/Chatroom_list.php:16
-#: ../../include/conversation.php:1814 ../../include/conversation.php:1817
-#: ../../include/nav.php:418 ../../include/nav.php:421
+#: ../../include/conversation.php:1816 ../../include/conversation.php:1819
+#: ../../include/nav.php:425 ../../include/nav.php:428
msgid "Chatrooms"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Widget/Chatroom_list.php:20
-msgid "Overview"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:467
+msgid "Untitled"
msgstr ""
-#: ../../Zotlabs/Widget/Rating.php:51
-msgid "Rating Tools"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:473
+msgid "Wiki resource_id required for git commit"
msgstr ""
-#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
-msgid "Rate Me"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:529
+#: ../../Zotlabs/Widget/Wiki_page_history.php:23
+msgctxt "wiki_history"
+msgid "Message"
msgstr ""
-#: ../../Zotlabs/Widget/Rating.php:60
-msgid "View Ratings"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:567
+#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579
+#: ../../include/bbcode.php:610 ../../include/bbcode.php:756
+msgid "Different viewers will see this text differently"
msgstr ""
#: ../../Zotlabs/Widget/Activity.php:50
@@ -7956,131 +9377,159 @@ msgctxt "widget"
msgid "Activity"
msgstr ""
-#: ../../Zotlabs/Widget/Follow.php:22
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+msgid "Member registrations waiting for confirmation"
msgstr ""
-#: ../../Zotlabs/Widget/Follow.php:29
-msgid "Add New Connection"
+#: ../../Zotlabs/Widget/Admin.php:29
+msgid "Inspect queue"
msgstr ""
-#: ../../Zotlabs/Widget/Follow.php:30
-msgid "Enter channel address"
+#: ../../Zotlabs/Widget/Admin.php:31
+msgid "DB updates"
msgstr ""
-#: ../../Zotlabs/Widget/Follow.php:31
-msgid "Examples: bob@example.com, https://example.com/barbara"
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:211
+msgid "Admin"
msgstr ""
-#: ../../Zotlabs/Widget/Wiki_list.php:15 ../../addon/gitwiki/gitwiki.php:95
-msgid "Wiki List"
+#: ../../Zotlabs/Widget/Admin.php:56
+msgid "Plugin Features"
msgstr ""
-#: ../../Zotlabs/Widget/Archive.php:43
-msgid "Archives"
+#: ../../Zotlabs/Widget/Affinity.php:49
+msgid "Refresh"
msgstr ""
-#: ../../Zotlabs/Widget/Conversations.php:17
-#: ../../Zotlabs/Widget/Conversations.php:29
-msgid "Conversations"
+#: ../../Zotlabs/Widget/Appcategories.php:39
+#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/taxonomy.php:188
+#: ../../include/taxonomy.php:270 ../../include/contact_widgets.php:91
+msgid "Categories"
msgstr ""
-#: ../../Zotlabs/Widget/Conversations.php:21
-msgid "Received Messages"
+#: ../../Zotlabs/Widget/Appcategories.php:42 ../../Zotlabs/Widget/Filer.php:31
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
msgstr ""
-#: ../../Zotlabs/Widget/Conversations.php:25
-msgid "Sent Messages"
+#: ../../Zotlabs/Widget/Archive.php:43
+msgid "Archives"
msgstr ""
-#: ../../Zotlabs/Widget/Conversations.php:39
-msgid "No messages."
+#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+msgid "Bookmarked Chatrooms"
msgstr ""
-#: ../../Zotlabs/Widget/Conversations.php:57
-msgid "Delete conversation"
+#: ../../Zotlabs/Widget/Chatroom_list.php:16
+#: ../../include/conversation.php:1807 ../../include/conversation.php:1810
+msgid "Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Chatroom_list.php:20
+msgid "Overview"
msgstr ""
#: ../../Zotlabs/Widget/Chatroom_members.php:11
msgid "Chat Members"
msgstr ""
-#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
-msgid "photo/image"
+#: ../../Zotlabs/Widget/Cover_photo.php:54
+msgid "Click to show more"
msgstr ""
-#: ../../Zotlabs/Widget/Savedsearch.php:75
-msgid "Remove term"
+#: ../../Zotlabs/Widget/Eventstools.php:13
+msgid "Events Tools"
msgstr ""
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301
-msgid "Saved Searches"
+#: ../../Zotlabs/Widget/Eventstools.php:14
+msgid "Export Calendar"
msgstr ""
-#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336
-msgid "add"
+#: ../../Zotlabs/Widget/Eventstools.php:15
+msgid "Import Calendar"
msgstr ""
-#: ../../Zotlabs/Widget/Notes.php:16
-msgid "Notes"
+#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
+#: ../../include/features.php:390
+msgid "Saved Folders"
msgstr ""
-#: ../../Zotlabs/Widget/Wiki_pages.php:52 ../../addon/gitwiki/gitwiki.php:76
-msgid "Wiki Pages"
+#: ../../Zotlabs/Widget/Follow.php:22
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
msgstr ""
-#: ../../Zotlabs/Widget/Wiki_pages.php:58 ../../addon/gitwiki/gitwiki.php:81
-msgid "Add new page"
+#: ../../Zotlabs/Widget/Follow.php:29
+msgid "Add New Connection"
msgstr ""
-#: ../../Zotlabs/Widget/Wiki_pages.php:59 ../../addon/gitwiki/gitwiki.php:82
-msgid "Page name"
+#: ../../Zotlabs/Widget/Follow.php:30
+msgid "Enter channel address"
msgstr ""
-#: ../../Zotlabs/Widget/Affinity.php:49
-msgid "Refresh"
+#: ../../Zotlabs/Widget/Follow.php:31
+msgid "Examples: bob@example.com, https://example.com/barbara"
msgstr ""
-#: ../../Zotlabs/Widget/Tasklist.php:23
-msgid "Tasks"
+#: ../../Zotlabs/Widget/Forums.php:85
+msgid "Forums"
msgstr ""
-#: ../../Zotlabs/Widget/Suggestions.php:51
-msgid "Suggestions"
+#: ../../Zotlabs/Widget/Mailmenu.php:13
+msgid "Private Mail Menu"
msgstr ""
-#: ../../Zotlabs/Widget/Suggestions.php:52
-msgid "See more..."
+#: ../../Zotlabs/Widget/Mailmenu.php:15
+msgid "Combined View"
msgstr ""
-#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
-#: ../../include/features.php:390
-msgid "Saved Folders"
+#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:191
+msgid "Inbox"
msgstr ""
-#: ../../Zotlabs/Widget/Cover_photo.php:54
-msgid "Click to show more"
+#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:192
+msgid "Outbox"
msgstr ""
-#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
-msgid "Member registrations waiting for confirmation"
+#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:193
+msgid "New Message"
msgstr ""
-#: ../../Zotlabs/Widget/Admin.php:29
-msgid "Inspect queue"
+#: ../../Zotlabs/Widget/Notes.php:16
+msgid "Notes"
msgstr ""
-#: ../../Zotlabs/Widget/Admin.php:31
-msgid "DB updates"
+#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
+msgid "photo/image"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Rating.php:51
+msgid "Rating Tools"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
+msgid "Rate Me"
msgstr ""
+#: ../../Zotlabs/Widget/Rating.php:60
+msgid "View Ratings"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Savedsearch.php:75
+msgid "Remove term"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301
+msgid "Saved Searches"
+=======
#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:215
msgid "Admin"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../Zotlabs/Widget/Admin.php:56
-msgid "Plugin Features"
+#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336
+msgid "add"
msgstr ""
#: ../../Zotlabs/Widget/Settings_menu.php:35
@@ -8123,1295 +9572,1474 @@ msgstr ""
msgid "Premium Channel Settings"
msgstr ""
-#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
-msgid "Bookmarked Chatrooms"
+#: ../../Zotlabs/Widget/Suggestedchats.php:32
+msgid "Suggested Chatrooms"
msgstr ""
-#: ../../util/nconfig.php:34
-msgid "Source channel not found."
+#: ../../Zotlabs/Widget/Suggestions.php:51
+msgid "Suggestions"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../Zotlabs/Widget/Suggestions.php:52
+msgid "See more..."
+msgstr ""
+
+#: ../../Zotlabs/Widget/Wiki_list.php:15
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:95
+msgid "Wiki List"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Wiki_pages.php:54
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:76
+msgid "Wiki Pages"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Wiki_pages.php:60
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:81
+msgid "Add new page"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Wiki_pages.php:61
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:82
+msgid "Page name"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Tasklist.php:23
+msgid "Tasks"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Zotlabs/Widget/Conversations.php:29
+msgid "Conversations"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:21
+msgid "Received Messages"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:25
+msgid "Sent Messages"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:39
+msgid "No messages."
msgstr ""
-#: ../../boot.php:1164 ../../addon/opensearch/opensearch.php:26
+#: ../../Zotlabs/Widget/Conversations.php:57
+msgid "Delete conversation"
+msgstr ""
+
+#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24
+msgid "Flag Adult Photos"
+msgstr ""
+
+#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:25
+msgid ""
+"Provide photo edit option to hide inappropriate photos from default album "
+"view"
+msgstr ""
+
+#: ../../extend/addon/addon/chords/Mod_Chords.php:44
+msgid ""
+"This is a fairly comprehensive and complete guitar chord dictionary which "
+"will list most of the available ways to play a certain chord, starting from "
+"the base of the fingerboard up to a few frets beyond the twelfth fret "
+"(beyond which everything repeats). A couple of non-standard tunings are "
+"provided for the benefit of slide players, etc."
+=======
+#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:26
#, php-format
msgctxt "opensearch"
msgid "Search %1$s (%2$s)"
msgstr ""
-#: ../../boot.php:1164 ../../addon/opensearch/opensearch.php:28
+#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:28
msgctxt "opensearch"
msgid "$Projectname"
msgstr ""
-#: ../../boot.php:1611
+#: ../../boot.php:1609
msgid "Create an account to access services and applications"
msgstr ""
-#: ../../boot.php:1630 ../../include/nav.php:103 ../../include/nav.php:127
+#: ../../boot.php:1628 ../../include/nav.php:103 ../../include/nav.php:127
msgid "Logout"
msgstr ""
-#: ../../boot.php:1633
+#: ../../boot.php:1631
msgid "Login/Email"
msgstr ""
-#: ../../boot.php:1634
+#: ../../boot.php:1632
msgid "Password"
msgstr ""
-#: ../../boot.php:1635
+#: ../../boot.php:1633
msgid "Remember me"
msgstr ""
-#: ../../boot.php:1638
+#: ../../boot.php:1636
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:2176
+#: ../../boot.php:2174
msgid "toggle mobile"
msgstr ""
-#: ../../boot.php:2329
+#: ../../boot.php:2327
#, php-format
msgid "[$Projectname] Website SSL error for %s"
msgstr ""
-#: ../../boot.php:2334
+#: ../../boot.php:2332
msgid "Website SSL certificate is not valid. Please correct."
msgstr ""
-#: ../../boot.php:2452
+#: ../../boot.php:2450
#, php-format
msgid "[$Projectname] Cron tasks not running on %s"
msgstr ""
-#: ../../boot.php:2457
+#: ../../boot.php:2455
msgid "Cron/Scheduled tasks not running."
msgstr ""
-#: ../../boot.php:2458 ../../include/datetime.php:286
+#: ../../boot.php:2456 ../../include/datetime.php:286
msgid "never"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:16
-#: ../../view/theme/redbasic/php/config.php:19
-msgid "Focus (Hubzilla default)"
+#: ../../extend/addon/addon/chords/Mod_Chords.php:46
+msgid ""
+"Chord names start with a root note (A-G) and may include sharps (#) and "
+"flats (b). This software will parse most of the standard naming conventions "
+"such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Theme settings"
+#: ../../extend/addon/addon/chords/Mod_Chords.php:48
+msgid ""
+"Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, "
+"E7b13b11 ..."
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:100
-msgid "Narrow navbar"
+#: ../../extend/addon/addon/chords/Mod_Chords.php:51
+msgid "Guitar Chords"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:101
-msgid "Navigation bar background color"
+#: ../../extend/addon/addon/chords/Mod_Chords.php:52
+msgid "The complete online chord dictionary"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:102
-msgid "Navigation bar icon color "
+#: ../../extend/addon/addon/chords/Mod_Chords.php:57
+msgid "Tuning"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:103
-msgid "Navigation bar active icon color "
+#: ../../extend/addon/addon/chords/Mod_Chords.php:58
+msgid "Chord name: example: Em7"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:104
-msgid "Link color"
+#: ../../extend/addon/addon/chords/Mod_Chords.php:59
+msgid "Show for left handed stringing"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:105
-msgid "Set font-color for banner"
+#: ../../extend/addon/addon/chords/chords.php:33
+msgid "Quick Reference"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:106
-msgid "Set the background color"
+#: ../../extend/addon/addon/dirstats/dirstats.php:94
+msgid "Hubzilla Directory Stats"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:107
-msgid "Set the background image"
+#: ../../extend/addon/addon/dirstats/dirstats.php:95
+msgid "Total Hubs"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:108
-msgid "Set the background color of items"
+#: ../../extend/addon/addon/dirstats/dirstats.php:97
+msgid "Hubzilla Hubs"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:109
-msgid "Set the background color of comments"
+#: ../../extend/addon/addon/dirstats/dirstats.php:99
+msgid "Friendica Hubs"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:110
-msgid "Set font-size for the entire application"
+#: ../../extend/addon/addon/dirstats/dirstats.php:101
+msgid "Diaspora Pods"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:110
+<<<<<<< HEAD
+#: ../../extend/addon/addon/dirstats/dirstats.php:103
+msgid "Hubzilla Channels"
+=======
+#: ../../view/theme/redbasic/php/config.php:99
msgid "Examples: 1rem, 100%, 16px"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:111
-msgid "Set font-color for posts and comments"
+#: ../../extend/addon/addon/dirstats/dirstats.php:105
+msgid "Friendica Channels"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:112
-msgid "Set radius of corners"
+#: ../../extend/addon/addon/dirstats/dirstats.php:107
+msgid "Diaspora Channels"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:112
-msgid "Example: 4px"
+#: ../../extend/addon/addon/dirstats/dirstats.php:109
+msgid "Aged 35 and above"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:113
-msgid "Set shadow depth of photos"
+#: ../../extend/addon/addon/dirstats/dirstats.php:111
+msgid "Aged 34 and under"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:114
-msgid "Set maximum width of content region in pixel"
+#: ../../extend/addon/addon/dirstats/dirstats.php:113
+msgid "Average Age"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:114
-msgid "Leave empty for default width"
+#: ../../extend/addon/addon/dirstats/dirstats.php:115
+msgid "Known Chatrooms"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:115
-msgid "Left align page content"
+#: ../../extend/addon/addon/dirstats/dirstats.php:117
+msgid "Known Tags"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:116
-msgid "Set size of conversation author photo"
+#: ../../extend/addon/addon/dirstats/dirstats.php:119
+msgid ""
+"Please note Diaspora and Friendica statistics are merely those **this "
+"directory** is aware of, and not all those known in the network. This also "
+"applies to chatrooms,"
msgstr ""
-#: ../../view/theme/redbasic/php/config.php:117
-msgid "Set size of followup author photos"
+#: ../../extend/addon/addon/donate/donate.php:21
+msgid "Project Servers and Resources"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:57
-msgid "Errors encountered deleting database table "
+#: ../../extend/addon/addon/donate/donate.php:22
+msgid "Project Creator and Tech Lead"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:95 ../../addon/twitter/twitter.php:773
-msgid "Submit Settings"
+#: ../../extend/addon/addon/donate/donate.php:23
+msgid "Admin, developer, directorymin, support bloke"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:96
-msgid "Drop tables when uninstalling?"
+#: ../../extend/addon/addon/donate/donate.php:50
+msgid ""
+"And the hundreds of other people and organisations who helped make the "
+"Hubzilla possible."
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:96
+#: ../../extend/addon/addon/donate/donate.php:53
msgid ""
-"If checked, the Rendezvous database tables will be deleted when the plugin "
-"is uninstalled."
+"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving "
+"their time and expertise - and often paying out of pocket for services they "
+"share with others."
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:97
-msgid "Mapbox Access Token"
+#: ../../extend/addon/addon/donate/donate.php:54
+msgid ""
+"There is no corporate funding and no ads, and we do not collect and sell "
+"your personal information. (We don't control your personal information - "
+"<strong>you do</strong>.)"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:97
+#: ../../extend/addon/addon/donate/donate.php:55
msgid ""
-"If you enter a Mapbox access token, it will be used to retrieve map tiles "
-"from Mapbox instead of the default OpenStreetMap tile server."
+"Help support our ground-breaking work in decentralisation, web identity, and "
+"privacy."
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:162
-msgid "Rendezvous"
+#: ../../extend/addon/addon/donate/donate.php:57
+msgid ""
+"Your donations keep servers and services running and also helps us to "
+"provide innovative new features and continued development."
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:167
+#: ../../extend/addon/addon/donate/donate.php:60
+msgid "Donate"
+msgstr ""
+
+#: ../../extend/addon/addon/donate/donate.php:62
msgid ""
-"This identity has been deleted by another member due to inactivity. Please "
-"press the \"New identity\" button or refresh the page to register a new "
-"identity. You may use the same name."
+"Choose a project, developer, or public hub to support with a one-time "
+"donation"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:168
-msgid "Welcome to Rendezvous!"
+#: ../../extend/addon/addon/donate/donate.php:63
+msgid "Donate Now"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:169
+#: ../../extend/addon/addon/donate/donate.php:64
msgid ""
-"Enter your name to join this rendezvous. To begin sharing your location with "
-"the other members, tap the GPS control. When your location is discovered, a "
-"red dot will appear and others will be able to see you on the map."
+"<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:171
-msgid "Let's meet here"
+#: ../../extend/addon/addon/donate/donate.php:65
+msgid ""
+"Please indicate if you would like your first name or full name (or nothing) "
+"to appear in our sponsor listing"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:174
-msgid "New marker"
+#: ../../extend/addon/addon/donate/donate.php:66
+msgid "Sponsor"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:175
-msgid "Edit marker"
+#: ../../extend/addon/addon/donate/donate.php:69
+msgid "Special thanks to: "
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:176
-msgid "New identity"
+#: ../../extend/addon/addon/dwpost/dwpost.php:42
+msgid "Post to Dreamwidth"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:177
-msgid "Delete marker"
+#: ../../extend/addon/addon/dwpost/dwpost.php:73
+msgid "Enable Dreamwidth Post Plugin"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:178
-msgid "Delete member"
+#: ../../extend/addon/addon/dwpost/dwpost.php:77
+msgid "Dreamwidth username"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:179
-msgid "Edit proximity alert"
+#: ../../extend/addon/addon/dwpost/dwpost.php:81
+msgid "Dreamwidth password"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:180
-msgid ""
-"A proximity alert will be issued when this member is within a certain radius "
-"of you.<br><br>Enter a radius in meters (0 to disable):"
+#: ../../extend/addon/addon/dwpost/dwpost.php:85
+msgid "Post to Dreamwidth by default"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:180
-#: ../../addon/rendezvous/rendezvous.php:185
-msgid "distance"
+#: ../../extend/addon/addon/dwpost/dwpost.php:89
+msgid "Dreamwidth Post Settings"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:181
-msgid "Proximity alert distance (meters)"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:45
+msgid "Flattr this!"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:182
-#: ../../addon/rendezvous/rendezvous.php:184
-msgid ""
-"A proximity alert will be issued when you are within a certain radius of the "
-"marker location.<br><br>Enter a radius in meters (0 to disable):"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:83
+msgid "Flattr widget settings updated."
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:183
-msgid "Marker proximity alert"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:100
+msgid "Flattr user"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:186
-msgid "Reminder note"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:104
+msgid "URL of the Thing to flattr"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:187
-msgid ""
-"Enter a note to be displayed when you are within the specified proximity..."
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:104
+msgid "If empty channel URL is used"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:199
-msgid "Add new rendezvous"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:108
+msgid "Title of the Thing to flattr"
msgstr ""
-#: ../../addon/rendezvous/rendezvous.php:200
-msgid ""
-"Create a new rendezvous and share the access link with those you wish to "
-"invite to the group. Those who open the link become members of the "
-"rendezvous. They can view other member locations, add markers to the map, or "
-"share their own locations with the group."
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:108
+msgid "If empty \"channel name on The Hubzilla\" will be used"
msgstr ""
-#: ../../addon/skeleton/skeleton.php:59
-msgid "Some setting"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112
+msgid "Static or dynamic flattr button"
msgstr ""
-#: ../../addon/skeleton/skeleton.php:61
-msgid "A setting"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112
+msgid "static"
msgstr ""
-#: ../../addon/skeleton/skeleton.php:64
-msgid "Skeleton Settings"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112
+msgid "dynamic"
+msgstr ""
+
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116
+msgid "Alignment of the widget"
+msgstr ""
+
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116
+msgid "left"
+msgstr ""
+
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116
+msgid "right"
+msgstr ""
+
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
+msgid "Enable Flattr widget"
+msgstr ""
+
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124
+msgid "Flattr Widget Settings"
+msgstr ""
+
+#: ../../extend/addon/addon/frphotos/frphotos.php:91
+msgid "Friendica Photo Album Import"
+msgstr ""
+
+#: ../../extend/addon/addon/frphotos/frphotos.php:92
+msgid "This will import all your Friendica photo albums to this Red channel."
+msgstr ""
+
+#: ../../extend/addon/addon/frphotos/frphotos.php:93
+msgid "Friendica Server base URL"
msgstr ""
-#: ../../addon/gnusoc/gnusoc.php:170
+#: ../../extend/addon/addon/frphotos/frphotos.php:94
+msgid "Friendica Login Username"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../extend/addon/addon/frphotos/frphotos.php:95
+msgid "Friendica Login Password"
+msgstr ""
+
+#: ../../extend/addon/addon/hubwall/hubwall.php:19
+msgid "Send email to all members"
+msgstr ""
+
+#: ../../extend/addon/addon/hubwall/hubwall.php:33
+#, php-format
+msgid "$1%s Administrator"
+msgstr ""
+
+#: ../../extend/addon/addon/hubwall/hubwall.php:50
+#: ../../extend/addon/addon/mailtest/mailtest.php:50
+msgid "No recipients found."
+msgstr ""
+
+#: ../../extend/addon/addon/hubwall/hubwall.php:73
+=======
+#: ../../addon/gnusoc/gnusoc.php:119
msgid "GNU-Social Protocol Settings updated."
msgstr ""
-#: ../../addon/gnusoc/gnusoc.php:181
+#: ../../addon/gnusoc/gnusoc.php:130
msgid "Enable the GNU-Social protocol for this channel"
msgstr ""
-#: ../../addon/gnusoc/gnusoc.php:185
+#: ../../addon/gnusoc/gnusoc.php:134
msgid "GNU-Social Protocol Settings"
msgstr ""
-#: ../../addon/gnusoc/gnusoc.php:376
+#: ../../addon/gnusoc/gnusoc.php:324
msgid "Follow"
msgstr ""
-#: ../../addon/gnusoc/gnusoc.php:379
+#: ../../addon/gnusoc/gnusoc.php:327
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
#, php-format
-msgid "%1$s is now following %2$s"
+msgid "%1$d of %2$d messages sent."
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:744
-msgid "INVALID EVENT DISMISSED!"
+#: ../../extend/addon/addon/hubwall/hubwall.php:81
+msgid "Send email to all hub members."
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:745
-msgid "Summary: "
+#: ../../extend/addon/addon/hubwall/hubwall.php:92
+#: ../../extend/addon/addon/mailtest/mailtest.php:96
+msgid "Message subject"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:746
-msgid "Date: "
+#: ../../extend/addon/addon/hubwall/hubwall.php:93
+msgid "Sender Email address"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:747 ../../addon/cdav/Mod_Cdav.php:754
-msgid "Reason: "
+#: ../../extend/addon/addon/hubwall/hubwall.php:94
+msgid "Test mode (only send to hub administrator)"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:752
-msgid "INVALID CARD DISMISSED!"
+#: ../../extend/addon/addon/ijpost/ijpost.php:42
+msgid "Post to Insanejournal"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:753
-msgid "Name: "
+#: ../../extend/addon/addon/ijpost/ijpost.php:73
+msgid "Enable InsaneJournal Post Plugin"
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."
+#: ../../extend/addon/addon/ijpost/ijpost.php:77
+msgid "InsaneJournal username"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:836 ../../addon/cdav/Mod_Cdav.php:837
-msgid "Example: YYYY-MM-DD HH:mm"
+#: ../../extend/addon/addon/ijpost/ijpost.php:81
+msgid "InsaneJournal password"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:837
-msgid "End date and time"
+#: ../../extend/addon/addon/ijpost/ijpost.php:85
+msgid "Post to InsaneJournal by default"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:852
-msgid "List month"
+#: ../../extend/addon/addon/ijpost/ijpost.php:89
+msgid "InsaneJournal Post Settings"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:853
-msgid "List week"
+#: ../../extend/addon/addon/ijpost/ijpost.php:104
+msgid "Insane Journal Settings saved."
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:854
-msgid "List day"
+#: ../../extend/addon/addon/irc/irc.php:45
+msgid "Channels to auto connect"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:861
-msgid "More"
+#: ../../extend/addon/addon/irc/irc.php:45
+#: ../../extend/addon/addon/irc/irc.php:49
+msgid "Comma separated list"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:862
-msgid "Less"
+#: ../../extend/addon/addon/irc/irc.php:49
+#: ../../extend/addon/addon/irc/irc.php:96
+msgid "Popular Channels"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:863
-msgid "Select calendar"
+#: ../../extend/addon/addon/irc/irc.php:53
+msgid "IRC Settings"
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:865
-msgid "Delete all"
+#: ../../extend/addon/addon/irc/irc.php:69
+msgid "IRC settings saved."
msgstr ""
-#: ../../addon/cdav/Mod_Cdav.php:867
-msgid "Sorry! Editing of recurrent events is not yet implemented."
+#: ../../extend/addon/addon/irc/irc.php:74
+msgid "IRC Chatroom"
msgstr ""
-#: ../../addon/cdav/cdav.php:36
-msgid "Errors encountered creating database table: "
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:305
+#: ../../include/channel.php:1138 ../../include/channel.php:1275
+msgid "Status:"
msgstr ""
-#: ../../addon/cdav/cdav.php:197
-msgid "Default Calendar"
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
+msgid "Activate addon"
msgstr ""
-#: ../../addon/cdav/cdav.php:206
-msgid "Default Addressbook"
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
+msgid "Hide Jappixmini Chat-Widget from the webinterface"
msgstr ""
-#: ../../addon/cdav/cdav.php:215
-msgid "CalDAV/CardDAV Settings saved."
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:318
+msgid "Jabber username"
msgstr ""
-#: ../../addon/cdav/cdav.php:234
-msgid "Enable CalDAV/CardDAV Server for this channel"
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:324
+msgid "Jabber server"
msgstr ""
-#: ../../addon/cdav/cdav.php:237
-#, php-format
-msgid "Your CalDAV resources are located at %s "
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:330
+msgid "Jabber BOSH host URL"
msgstr ""
-#: ../../addon/cdav/cdav.php:240
-#, php-format
-msgid "Your CardDAV resources are located at %s "
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:337
+msgid "Jabber password"
msgstr ""
-#: ../../addon/cdav/cdav.php:246
-msgid "CalDAV/CardDAV Settings"
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
+msgid "Encrypt Jabber password with Hubzilla password"
msgstr ""
-#: ../../addon/cdav/cdav.php:272 ../../include/connections.php:676
-msgid "Home, Voice"
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:347
+#: ../../extend/addon/addon/redred/redred.php:115
+msgid "Hubzilla password"
msgstr ""
-#: ../../addon/cdav/cdav.php:273 ../../include/connections.php:677
-msgid "Home, Fax"
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
+msgid "Approve subscription requests from Hubzilla contacts automatically"
msgstr ""
-#: ../../addon/cdav/cdav.php:275 ../../include/connections.php:679
-msgid "Work, Voice"
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
+msgid "Purge internal list of jabber addresses of contacts"
msgstr ""
-#: ../../addon/cdav/cdav.php:276 ../../include/connections.php:680
-msgid "Work, Fax"
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:364
+msgid "Configuration Help"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:37
-msgid "Select Channel"
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:371
+msgid "Jappix Mini Settings"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:42
-msgid "Read-write"
+#: ../../extend/addon/addon/js_upload/js_upload.php:44
+msgid "Upload a file"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:43
-msgid "Read-only"
+#: ../../extend/addon/addon/js_upload/js_upload.php:45
+msgid "Drop files here to upload"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:116
-msgid "My Calendars"
+#: ../../extend/addon/addon/js_upload/js_upload.php:47
+msgid "Failed"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:118
-msgid "Shared Calendars"
+#: ../../extend/addon/addon/js_upload/js_upload.php:315
+msgid "No files were uploaded."
msgstr ""
-#: ../../addon/cdav/include/widgets.php:122
-msgid "Share this calendar"
+#: ../../extend/addon/addon/js_upload/js_upload.php:322
+msgid "Uploaded file is empty"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:124
-msgid "Calendar name and color"
+#: ../../extend/addon/addon/js_upload/js_upload.php:335
+msgid "Image exceeds size limit of "
msgstr ""
-#: ../../addon/cdav/include/widgets.php:126
-msgid "Create new calendar"
+#: ../../extend/addon/addon/js_upload/js_upload.php:347
+msgid "File has an invalid extension, it should be one of "
msgstr ""
-#: ../../addon/cdav/include/widgets.php:128
-msgid "Calendar Name"
+#: ../../extend/addon/addon/js_upload/js_upload.php:359
+msgid "Upload was cancelled, or server error encountered"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:129
-msgid "Calendar Tools"
+#: ../../extend/addon/addon/ldapauth/ldapauth.php:61
+msgid "An account has been created for you."
msgstr ""
-#: ../../addon/cdav/include/widgets.php:130
-msgid "Import calendar"
+#: ../../extend/addon/addon/ldapauth/ldapauth.php:68
+msgid "Authentication successful but rejected: account creation is disabled."
msgstr ""
-#: ../../addon/cdav/include/widgets.php:131
-msgid "Select a calendar to import to"
+#: ../../extend/addon/addon/libertree/libertree.php:38
+msgid "Post to Libertree"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:158
-msgid "Addressbooks"
+#: ../../extend/addon/addon/libertree/libertree.php:69
+msgid "Enable Libertree Post Plugin"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:160
-msgid "Addressbook name"
+#: ../../extend/addon/addon/libertree/libertree.php:73
+msgid "Libertree API token"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:162
-msgid "Create new addressbook"
+#: ../../extend/addon/addon/libertree/libertree.php:77
+msgid "Libertree site URL"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:163
-msgid "Addressbook Name"
+#: ../../extend/addon/addon/libertree/libertree.php:81
+msgid "Post to Libertree by default"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:165
-msgid "Addressbook Tools"
+#: ../../extend/addon/addon/libertree/libertree.php:85
+msgid "Libertree Post Settings"
msgstr ""
-#: ../../addon/cdav/include/widgets.php:166
-msgid "Import addressbook"
+#: ../../extend/addon/addon/libertree/libertree.php:99
+msgid "Libertree Settings saved."
msgstr ""
-#: ../../addon/cdav/include/widgets.php:167
-msgid "Select an addressbook to import to"
+#: ../../extend/addon/addon/ljpost/ljpost.php:42
+msgid "Post to LiveJournal"
msgstr ""
-#: ../../addon/planets/planets.php:121
-msgid "Planets Settings updated."
+#: ../../extend/addon/addon/ljpost/ljpost.php:70
+msgid "Enable LiveJournal Post Plugin"
msgstr ""
-#: ../../addon/planets/planets.php:153
-msgid "Enable Planets Plugin"
+#: ../../extend/addon/addon/ljpost/ljpost.php:74
+msgid "LiveJournal username"
msgstr ""
-#: ../../addon/planets/planets.php:157
-msgid "Planets Settings"
+#: ../../extend/addon/addon/ljpost/ljpost.php:78
+msgid "LiveJournal password"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:50
-#: ../../addon/openclipatar/openclipatar.php:128
-msgid "System defaults:"
+#: ../../extend/addon/addon/ljpost/ljpost.php:82
+msgid "Post to LiveJournal by default"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:54
-msgid "Preferred Clipart IDs"
+#: ../../extend/addon/addon/ljpost/ljpost.php:86
+msgid "LiveJournal Post Settings"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:54
-msgid "List of preferred clipart ids. These will be shown first."
+#: ../../extend/addon/addon/ljpost/ljpost.php:101
+msgid "LiveJournal Settings saved."
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:55
-msgid "Default Search Term"
+#: ../../extend/addon/addon/logrot/logrot.php:36
+msgid "Logfile archive directory"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:55
-msgid "The default search term. These will be shown second."
+#: ../../extend/addon/addon/logrot/logrot.php:36
+msgid "Directory to store rotated logs"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:56
-msgid "Return After"
+#: ../../extend/addon/addon/logrot/logrot.php:37
+msgid "Logfile size in bytes before rotating"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:56
-msgid "Page to load after image selection."
+#: ../../extend/addon/addon/logrot/logrot.php:38
+msgid "Number of logfiles to retain"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1062
+<<<<<<< HEAD
+#: ../../extend/addon/addon/mailhost/mailhost.php:36
+msgid "Email notification hub"
+=======
+#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1048
#: ../../include/nav.php:111
msgid "Edit Profile"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:59
-msgid "Profile List"
+#: ../../extend/addon/addon/mailhost/mailhost.php:36
+msgid "Hostname"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:61
-msgid "Order of Preferred"
+#: ../../extend/addon/addon/mailhost/mailhost.php:40
+msgid "Mailhost Settings"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:61
-msgid "Sort order of preferred clipart ids."
+#: ../../extend/addon/addon/mailhost/mailhost.php:54
+msgid "MAILHOST Settings saved."
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:62
-#: ../../addon/openclipatar/openclipatar.php:68
-msgid "Newest first"
+#: ../../extend/addon/addon/moremoods/moremoods.php:19
+msgid "lonely"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:65
-msgid "As entered"
+#: ../../extend/addon/addon/moremoods/moremoods.php:20
+msgid "drunk"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:67
-msgid "Order of other"
+#: ../../extend/addon/addon/moremoods/moremoods.php:21
+msgid "horny"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:67
-msgid "Sort order of other clipart ids."
+#: ../../extend/addon/addon/moremoods/moremoods.php:22
+msgid "stoned"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:69
-msgid "Most downloaded first"
+#: ../../extend/addon/addon/moremoods/moremoods.php:23
+msgid "fucked up"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:70
-msgid "Most liked first"
+#: ../../extend/addon/addon/moremoods/moremoods.php:24
+msgid "clusterfucked"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:72
-msgid "Preferred IDs Message"
+#: ../../extend/addon/addon/moremoods/moremoods.php:25
+msgid "crazy"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:72
-msgid "Message to display above preferred results."
+#: ../../extend/addon/addon/moremoods/moremoods.php:26
+msgid "hurt"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:78
-msgid "Uploaded by: "
+#: ../../extend/addon/addon/moremoods/moremoods.php:27
+msgid "sleepy"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:78
-msgid "Drawn by: "
+#: ../../extend/addon/addon/moremoods/moremoods.php:28
+msgid "grumpy"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:192
-msgid "Or select from a free OpenClipart.org image:"
+#: ../../extend/addon/addon/moremoods/moremoods.php:29
+msgid "high"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:195
-msgid "Search Term"
+#: ../../extend/addon/addon/moremoods/moremoods.php:30
+msgid "semi-conscious"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:232
-msgid "Unknown error. Please try again later."
+#: ../../extend/addon/addon/moremoods/moremoods.php:31
+msgid "in love"
msgstr ""
-#: ../../addon/openclipatar/openclipatar.php:308
-msgid "Profile photo updated successfully."
+#: ../../extend/addon/addon/moremoods/moremoods.php:32
+msgid "in lust"
msgstr ""
-#: ../../addon/adultphotoflag/adultphotoflag.php:24
-msgid "Flag Adult Photos"
+#: ../../extend/addon/addon/moremoods/moremoods.php:33
+msgid "naked"
msgstr ""
-#: ../../addon/adultphotoflag/adultphotoflag.php:25
-msgid ""
-"Provide photo edit option to hide inappropriate photos from default album "
-"view"
+#: ../../extend/addon/addon/moremoods/moremoods.php:34
+msgid "stinky"
msgstr ""
-#: ../../addon/wppost/wppost.php:45
-msgid "Post to WordPress"
+#: ../../extend/addon/addon/moremoods/moremoods.php:35
+msgid "sweaty"
msgstr ""
-#: ../../addon/wppost/wppost.php:82
-msgid "Enable WordPress Post Plugin"
+#: ../../extend/addon/addon/moremoods/moremoods.php:36
+msgid "bleeding out"
msgstr ""
-#: ../../addon/wppost/wppost.php:86
-msgid "WordPress username"
+#: ../../extend/addon/addon/moremoods/moremoods.php:37
+msgid "victorious"
msgstr ""
-#: ../../addon/wppost/wppost.php:90
-msgid "WordPress password"
+#: ../../extend/addon/addon/moremoods/moremoods.php:38
+msgid "defeated"
msgstr ""
-#: ../../addon/wppost/wppost.php:94
-msgid "WordPress API URL"
+#: ../../extend/addon/addon/moremoods/moremoods.php:39
+msgid "envious"
msgstr ""
-#: ../../addon/wppost/wppost.php:95
-msgid "Typically https://your-blog.tld/xmlrpc.php"
+#: ../../extend/addon/addon/moremoods/moremoods.php:40
+msgid "jealous"
msgstr ""
-#: ../../addon/wppost/wppost.php:98
-msgid "WordPress blogid"
+#: ../../extend/addon/addon/morepokes/morepokes.php:19
+msgid "bitchslap"
msgstr ""
-#: ../../addon/wppost/wppost.php:99
-msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
+#: ../../extend/addon/addon/morepokes/morepokes.php:19
+msgid "bitchslapped"
msgstr ""
-#: ../../addon/wppost/wppost.php:105
-msgid "Post to WordPress by default"
+#: ../../extend/addon/addon/morepokes/morepokes.php:20
+msgid "shag"
msgstr ""
-#: ../../addon/wppost/wppost.php:109
-msgid "Forward comments (requires hubzilla_wp plugin)"
+#: ../../extend/addon/addon/morepokes/morepokes.php:20
+msgid "shagged"
msgstr ""
-#: ../../addon/wppost/wppost.php:113
-msgid "WordPress Post Settings"
+#: ../../extend/addon/addon/morepokes/morepokes.php:21
+msgid "patent"
msgstr ""
-#: ../../addon/wppost/wppost.php:129
-msgid "Wordpress Settings saved."
+#: ../../extend/addon/addon/morepokes/morepokes.php:21
+msgid "patented"
msgstr ""
-#: ../../addon/nsfw/nsfw.php:80
-msgid ""
-"This plugin looks in posts for the words/text you specify below, and "
-"collapses any content containing those keywords so it is not displayed at "
-"inappropriate times, such as sexual innuendo that may be improper in a work "
-"setting. It is polite and recommended to tag any content containing nudity "
-"with #NSFW. This filter can also match any other word/text you specify, and "
-"can thereby be used as a general purpose content filter."
+#: ../../extend/addon/addon/morepokes/morepokes.php:22
+msgid "hug"
msgstr ""
-#: ../../addon/nsfw/nsfw.php:84
-msgid "Enable Content filter"
+#: ../../extend/addon/addon/morepokes/morepokes.php:22
+msgid "hugged"
msgstr ""
-#: ../../addon/nsfw/nsfw.php:88
-msgid "Comma separated list of keywords to hide"
+#: ../../extend/addon/addon/morepokes/morepokes.php:23
+msgid "murder"
msgstr ""
-#: ../../addon/nsfw/nsfw.php:88
-msgid "Word, /regular-expression/, lang=xx, lang!=xx"
+#: ../../extend/addon/addon/morepokes/morepokes.php:23
+msgid "murdered"
msgstr ""
-#: ../../addon/nsfw/nsfw.php:92
-msgid "Not Safe For Work Settings"
+#: ../../extend/addon/addon/morepokes/morepokes.php:24
+msgid "worship"
msgstr ""
-#: ../../addon/nsfw/nsfw.php:92
-msgid "General Purpose Content Filter"
+#: ../../extend/addon/addon/morepokes/morepokes.php:24
+msgid "worshipped"
msgstr ""
-#: ../../addon/nsfw/nsfw.php:110
-msgid "NSFW Settings saved."
+#: ../../extend/addon/addon/morepokes/morepokes.php:25
+msgid "kiss"
msgstr ""
-#: ../../addon/nsfw/nsfw.php:207
-msgid "Possible adult content"
+#: ../../extend/addon/addon/morepokes/morepokes.php:25
+msgid "kissed"
msgstr ""
-#: ../../addon/nsfw/nsfw.php:211
-#, php-format
-msgid "%s - view"
+#: ../../extend/addon/addon/morepokes/morepokes.php:26
+msgid "tempt"
msgstr ""
-#: ../../addon/ijpost/ijpost.php:42
-msgid "Post to Insanejournal"
+#: ../../extend/addon/addon/morepokes/morepokes.php:26
+msgid "tempted"
msgstr ""
-#: ../../addon/ijpost/ijpost.php:73
-msgid "Enable InsaneJournal Post Plugin"
+#: ../../extend/addon/addon/morepokes/morepokes.php:27
+msgid "raise eyebrows at"
msgstr ""
-#: ../../addon/ijpost/ijpost.php:77
-msgid "InsaneJournal username"
+#: ../../extend/addon/addon/morepokes/morepokes.php:27
+msgid "raised their eyebrows at"
msgstr ""
-#: ../../addon/ijpost/ijpost.php:81
-msgid "InsaneJournal password"
+#: ../../extend/addon/addon/morepokes/morepokes.php:28
+msgid "insult"
msgstr ""
-#: ../../addon/ijpost/ijpost.php:85
-msgid "Post to InsaneJournal by default"
+#: ../../extend/addon/addon/morepokes/morepokes.php:28
+msgid "insulted"
msgstr ""
-#: ../../addon/ijpost/ijpost.php:89
-msgid "InsaneJournal Post Settings"
+#: ../../extend/addon/addon/morepokes/morepokes.php:29
+msgid "praise"
msgstr ""
-#: ../../addon/ijpost/ijpost.php:104
-msgid "Insane Journal Settings saved."
+#: ../../extend/addon/addon/morepokes/morepokes.php:29
+msgid "praised"
msgstr ""
-#: ../../addon/js_upload/js_upload.php:44
-msgid "Upload a file"
+#: ../../extend/addon/addon/morepokes/morepokes.php:30
+msgid "be dubious of"
msgstr ""
-#: ../../addon/js_upload/js_upload.php:45
-msgid "Drop files here to upload"
+#: ../../extend/addon/addon/morepokes/morepokes.php:30
+msgid "was dubious of"
msgstr ""
-#: ../../addon/js_upload/js_upload.php:47
-msgid "Failed"
+#: ../../extend/addon/addon/morepokes/morepokes.php:31
+msgid "eat"
msgstr ""
-#: ../../addon/js_upload/js_upload.php:315
-msgid "No files were uploaded."
+#: ../../extend/addon/addon/morepokes/morepokes.php:31
+msgid "ate"
msgstr ""
-#: ../../addon/js_upload/js_upload.php:322
-msgid "Uploaded file is empty"
+#: ../../extend/addon/addon/morepokes/morepokes.php:32
+msgid "giggle and fawn at"
msgstr ""
-#: ../../addon/js_upload/js_upload.php:335
-msgid "Image exceeds size limit of "
+#: ../../extend/addon/addon/morepokes/morepokes.php:32
+msgid "giggled and fawned at"
msgstr ""
-#: ../../addon/js_upload/js_upload.php:347
-msgid "File has an invalid extension, it should be one of "
+#: ../../extend/addon/addon/morepokes/morepokes.php:33
+msgid "doubt"
msgstr ""
-#: ../../addon/js_upload/js_upload.php:359
-msgid "Upload was cancelled, or server error encountered"
+#: ../../extend/addon/addon/morepokes/morepokes.php:33
+msgid "doubted"
msgstr ""
-#: ../../addon/dwpost/dwpost.php:42
-msgid "Post to Dreamwidth"
+#: ../../extend/addon/addon/morepokes/morepokes.php:34
+msgid "glare"
msgstr ""
-#: ../../addon/dwpost/dwpost.php:73
-msgid "Enable Dreamwidth Post Plugin"
+#: ../../extend/addon/addon/morepokes/morepokes.php:34
+msgid "glared at"
msgstr ""
-#: ../../addon/dwpost/dwpost.php:77
-msgid "Dreamwidth username"
+#: ../../extend/addon/addon/morepokes/morepokes.php:35
+msgid "fuck"
msgstr ""
-#: ../../addon/dwpost/dwpost.php:81
-msgid "Dreamwidth password"
+#: ../../extend/addon/addon/morepokes/morepokes.php:35
+msgid "fucked"
msgstr ""
-#: ../../addon/dwpost/dwpost.php:85
-msgid "Post to Dreamwidth by default"
+#: ../../extend/addon/addon/morepokes/morepokes.php:36
+msgid "bonk"
msgstr ""
-#: ../../addon/dwpost/dwpost.php:89
-msgid "Dreamwidth Post Settings"
+#: ../../extend/addon/addon/morepokes/morepokes.php:36
+msgid "bonked"
msgstr ""
-#: ../../addon/firefox/firefox.php:23
-msgid "Install Firefox Sharing Tools"
+#: ../../extend/addon/addon/morepokes/morepokes.php:37
+msgid "declare undying love for"
msgstr ""
-#: ../../addon/firefox/firefox.php:34
-msgid "Share content from Firefox to $Projectname"
+#: ../../extend/addon/addon/morepokes/morepokes.php:37
+msgid "declared undying love for"
msgstr ""
-#: ../../addon/firefox/firefox.php:37
-msgid "Install Firefox Sharing Tools to this web browser"
+#: ../../extend/addon/addon/msgfooter/msgfooter.php:46
+#: ../../extend/addon/addon/xmpp/xmpp.php:91
+msgid "Save Settings"
msgstr ""
-#: ../../addon/dirstats/dirstats.php:94
-msgid "Hubzilla Directory Stats"
+#: ../../extend/addon/addon/msgfooter/msgfooter.php:47
+msgid "text to include in all outgoing posts from this site"
msgstr ""
-#: ../../addon/dirstats/dirstats.php:95
-msgid "Total Hubs"
+#: ../../extend/addon/addon/nofed/nofed.php:42
+msgid "Federate"
msgstr ""
-#: ../../addon/dirstats/dirstats.php:97
-msgid "Hubzilla Hubs"
+#: ../../extend/addon/addon/nofed/nofed.php:56
+msgid "nofed Settings saved."
msgstr ""
-#: ../../addon/dirstats/dirstats.php:99
-msgid "Friendica Hubs"
+#: ../../extend/addon/addon/nofed/nofed.php:72
+msgid "Allow Federation Toggle"
msgstr ""
-#: ../../addon/dirstats/dirstats.php:101
-msgid "Diaspora Pods"
+#: ../../extend/addon/addon/nofed/nofed.php:76
+msgid "Federate posts by default"
msgstr ""
-#: ../../addon/dirstats/dirstats.php:103
-msgid "Hubzilla Channels"
+#: ../../extend/addon/addon/nofed/nofed.php:80
+msgid "NoFed Settings"
msgstr ""
-#: ../../addon/dirstats/dirstats.php:105
-msgid "Friendica Channels"
+#: ../../extend/addon/addon/nsabait/nsabait.php:125
+msgid "Nsabait Settings updated."
msgstr ""
-#: ../../addon/dirstats/dirstats.php:107
-msgid "Diaspora Channels"
+#: ../../extend/addon/addon/nsabait/nsabait.php:157
+msgid "Enable NSAbait Plugin"
msgstr ""
-#: ../../addon/dirstats/dirstats.php:109
-msgid "Aged 35 and above"
+#: ../../extend/addon/addon/nsabait/nsabait.php:161
+msgid "NSAbait Settings"
msgstr ""
-#: ../../addon/dirstats/dirstats.php:111
-msgid "Aged 34 and under"
+#: ../../extend/addon/addon/nsfw/nsfw.php:80
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW. This filter can also match any other word/text you specify, and "
+"can thereby be used as a general purpose content filter."
msgstr ""
-#: ../../addon/dirstats/dirstats.php:113
-msgid "Average Age"
+#: ../../extend/addon/addon/nsfw/nsfw.php:84
+msgid "Enable Content filter"
msgstr ""
-#: ../../addon/dirstats/dirstats.php:115
-msgid "Known Chatrooms"
+#: ../../extend/addon/addon/nsfw/nsfw.php:88
+msgid "Comma separated list of keywords to hide"
msgstr ""
-#: ../../addon/dirstats/dirstats.php:117
-msgid "Known Tags"
+#: ../../extend/addon/addon/nsfw/nsfw.php:88
+msgid "Word, /regular-expression/, lang=xx, lang!=xx"
msgstr ""
-#: ../../addon/dirstats/dirstats.php:119
-msgid ""
-"Please note Diaspora and Friendica statistics are merely those **this "
-"directory** is aware of, and not all those known in the network. This also "
-"applies to chatrooms,"
+#: ../../extend/addon/addon/nsfw/nsfw.php:92
+msgid "Not Safe For Work Settings"
msgstr ""
-#: ../../addon/mailhost/mailhost.php:36
-msgid "Email notification hub"
+#: ../../extend/addon/addon/nsfw/nsfw.php:92
+msgid "General Purpose Content Filter"
msgstr ""
-#: ../../addon/mailhost/mailhost.php:36
-msgid "Hostname"
+#: ../../extend/addon/addon/nsfw/nsfw.php:110
+msgid "NSFW Settings saved."
msgstr ""
-#: ../../addon/mailhost/mailhost.php:40
-msgid "Mailhost Settings"
+#: ../../extend/addon/addon/nsfw/nsfw.php:207
+msgid "Possible adult content"
msgstr ""
-#: ../../addon/mailhost/mailhost.php:54
-msgid "MAILHOST Settings saved."
+#: ../../extend/addon/addon/nsfw/nsfw.php:211
+#, php-format
+msgid "%s - view"
msgstr ""
-#: ../../addon/likebanner/likebanner.php:51
-msgid "Your Webbie:"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:50
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:128
+msgid "System defaults:"
msgstr ""
-#: ../../addon/likebanner/likebanner.php:54
-msgid "Fontsize (px):"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:54
+msgid "Preferred Clipart IDs"
msgstr ""
-#: ../../addon/likebanner/likebanner.php:68
-msgid "Link:"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:54
+msgid "List of preferred clipart ids. These will be shown first."
msgstr ""
-#: ../../addon/likebanner/likebanner.php:70
-msgid "Like us on Hubzilla"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:55
+msgid "Default Search Term"
msgstr ""
-#: ../../addon/likebanner/likebanner.php:72
-msgid "Embed:"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:55
+msgid "The default search term. These will be shown second."
msgstr ""
-#: ../../addon/redphotos/redphotos.php:106
-msgid "Photos imported"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:56
+msgid "Return After"
msgstr ""
-#: ../../addon/redphotos/redphotos.php:129
-msgid "Redmatrix Photo Album Import"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:56
+msgid "Page to load after image selection."
msgstr ""
-#: ../../addon/redphotos/redphotos.php:130
-msgid "This will import all your Redmatrix photo albums to this channel."
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:58
+#: ../../include/nav.php:107 ../../include/channel.php:1047
+msgid "Edit Profile"
msgstr ""
-#: ../../addon/redphotos/redphotos.php:131
-#: ../../addon/redfiles/redfiles.php:121
-msgid "Redmatrix Server base URL"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:59
+msgid "Profile List"
msgstr ""
-#: ../../addon/redphotos/redphotos.php:132
-#: ../../addon/redfiles/redfiles.php:122
-msgid "Redmatrix Login Username"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:61
+msgid "Order of Preferred"
msgstr ""
-#: ../../addon/redphotos/redphotos.php:133
-#: ../../addon/redfiles/redfiles.php:123
-msgid "Redmatrix Login Password"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:61
+msgid "Sort order of preferred clipart ids."
msgstr ""
-#: ../../addon/redphotos/redphotos.php:134
-msgid "Import just this album"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:62
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:68
+msgid "Newest first"
msgstr ""
-#: ../../addon/redphotos/redphotos.php:134
-msgid "Leave blank to import all albums"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:65
+msgid "As entered"
msgstr ""
-#: ../../addon/redphotos/redphotos.php:135
-msgid "Maximum count to import"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:67
+msgid "Order of other"
msgstr ""
-#: ../../addon/redphotos/redphotos.php:135
-msgid "0 or blank to import all available"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:67
+msgid "Sort order of other clipart ids."
msgstr ""
-#: ../../addon/irc/irc.php:45
-msgid "Channels to auto connect"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:69
+msgid "Most downloaded first"
msgstr ""
-#: ../../addon/irc/irc.php:45 ../../addon/irc/irc.php:49
-msgid "Comma separated list"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:70
+msgid "Most liked first"
msgstr ""
-#: ../../addon/irc/irc.php:49 ../../addon/irc/irc.php:96
-msgid "Popular Channels"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:72
+msgid "Preferred IDs Message"
msgstr ""
-#: ../../addon/irc/irc.php:53
-msgid "IRC Settings"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:72
+msgid "Message to display above preferred results."
msgstr ""
-#: ../../addon/irc/irc.php:69
-msgid "IRC settings saved."
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:78
+msgid "Uploaded by: "
msgstr ""
-#: ../../addon/irc/irc.php:74
-msgid "IRC Chatroom"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:78
+msgid "Drawn by: "
msgstr ""
-#: ../../addon/ljpost/ljpost.php:42
-msgid "Post to LiveJournal"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:192
+msgid "Or select from a free OpenClipart.org image:"
msgstr ""
-#: ../../addon/ljpost/ljpost.php:70
-msgid "Enable LiveJournal Post Plugin"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:195
+msgid "Search Term"
msgstr ""
-#: ../../addon/ljpost/ljpost.php:74
-msgid "LiveJournal username"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:232
+msgid "Unknown error. Please try again later."
msgstr ""
-#: ../../addon/ljpost/ljpost.php:78
-msgid "LiveJournal password"
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:308
+msgid "Profile photo updated successfully."
msgstr ""
-#: ../../addon/ljpost/ljpost.php:82
-msgid "Post to LiveJournal by default"
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:146
+msgid "View Larger"
msgstr ""
-#: ../../addon/ljpost/ljpost.php:86
-msgid "LiveJournal Post Settings"
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:169
+msgid "Tile Server URL"
msgstr ""
-#: ../../addon/ljpost/ljpost.php:101
-msgid "LiveJournal Settings saved."
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:169
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
+"\">public tile servers</a>"
msgstr ""
-#: ../../addon/openid/openid.php:49
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:170
+msgid "Nominatim (reverse geocoding) Server URL"
+msgstr ""
+
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:170
msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target="
+"\"_blank\">Nominatim servers</a>"
msgstr ""
-#: ../../addon/openid/openid.php:49
-msgid "The error message was:"
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:171
+msgid "Default zoom"
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:52
-msgid "First Name"
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:171
+msgid ""
+"The default zoom level. (1:world, 18:highest, also depends on tile server)"
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:53
-msgid "Last Name"
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:172
+msgid "Include marker on map"
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:54 ../../addon/redred/redred.php:111
-msgid "Nickname"
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:172
+msgid "Include a marker on the map."
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:55
-msgid "Full Name"
+#: ../../extend/addon/addon/pageheader/pageheader.php:43
+msgid "Message to display on every page on this server"
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:61
-msgid "Profile Photo 16px"
+#: ../../extend/addon/addon/pageheader/pageheader.php:48
+msgid "Pageheader Settings"
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:62
-msgid "Profile Photo 32px"
+#: ../../extend/addon/addon/pageheader/pageheader.php:64
+msgid "pageheader Settings saved."
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:63
-msgid "Profile Photo 48px"
+#: ../../extend/addon/addon/piwik/piwik.php:85
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:64
-msgid "Profile Photo 64px"
+#: ../../extend/addon/addon/piwik/piwik.php:88
+#, php-format
+msgid ""
+"If you do not want that your visits are logged this way you <a href='%s'>can "
+"set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:65
-msgid "Profile Photo 80px"
+#: ../../extend/addon/addon/piwik/piwik.php:96
+msgid "Piwik Base URL"
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:66
-msgid "Profile Photo 128px"
+#: ../../extend/addon/addon/piwik/piwik.php:96
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:67
-msgid "Timezone"
+#: ../../extend/addon/addon/piwik/piwik.php:97
+msgid "Site ID"
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:70
-msgid "Birth Year"
+#: ../../extend/addon/addon/piwik/piwik.php:98
+msgid "Show opt-out cookie link?"
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:71
-msgid "Birth Month"
+#: ../../extend/addon/addon/piwik/piwik.php:99
+msgid "Asynchronous tracking"
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:72
-msgid "Birth Day"
+#: ../../extend/addon/addon/piwik/piwik.php:100
+msgid "Enable frontend JavaScript error tracking"
msgstr ""
-#: ../../addon/openid/MysqlProvider.php:73
-msgid "Birthdate"
+#: ../../extend/addon/addon/piwik/piwik.php:100
+msgid "This feature requires Piwik >= 2.2.0"
msgstr ""
-#: ../../addon/openid/Mod_Openid.php:30
-msgid "OpenID protocol error. No ID returned."
+#: ../../extend/addon/addon/planets/planets.php:121
+msgid "Planets Settings updated."
msgstr ""
-#: ../../addon/openid/Mod_Openid.php:188 ../../include/auth.php:286
-msgid "Login failed."
+#: ../../extend/addon/addon/planets/planets.php:153
+msgid "Enable Planets Plugin"
msgstr ""
-#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Male"
+#: ../../extend/addon/addon/planets/planets.php:157
+msgid "Planets Settings"
msgstr ""
-#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Female"
+#: ../../extend/addon/addon/pumpio/pumpio.php:148
+msgid "You are now authenticated to pumpio."
msgstr ""
-#: ../../addon/randpost/randpost.php:97
-msgid "You're welcome."
+#: ../../extend/addon/addon/pumpio/pumpio.php:149
+msgid "return to the featured settings page"
msgstr ""
-#: ../../addon/randpost/randpost.php:98
-msgid "Ah shucks..."
+#: ../../extend/addon/addon/pumpio/pumpio.php:163
+msgid "Post to Pump.io"
msgstr ""
-#: ../../addon/randpost/randpost.php:99
-msgid "Don't mention it."
+#: ../../extend/addon/addon/pumpio/pumpio.php:198
+msgid "Pump.io servername"
msgstr ""
-#: ../../addon/randpost/randpost.php:100
-msgid "&lt;blush&gt;"
+#: ../../extend/addon/addon/pumpio/pumpio.php:198
+msgid "Without \"http://\" or \"https://\""
msgstr ""
-#: ../../addon/startpage/startpage.php:109
-msgid "Page to load after login"
+#: ../../extend/addon/addon/pumpio/pumpio.php:202
+msgid "Pump.io username"
msgstr ""
-#: ../../addon/startpage/startpage.php:109
-msgid ""
-"Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy "
-"collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave "
-"blank for default network page (grid)."
+#: ../../extend/addon/addon/pumpio/pumpio.php:202
+msgid "Without the servername"
msgstr ""
-#: ../../addon/startpage/startpage.php:113
-msgid "Startpage Settings"
+#: ../../extend/addon/addon/pumpio/pumpio.php:213
+msgid "You are not authenticated to pumpio"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:19
-msgid "bitchslap"
+#: ../../extend/addon/addon/pumpio/pumpio.php:215
+msgid "(Re-)Authenticate your pump.io connection"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:19
-msgid "bitchslapped"
+#: ../../extend/addon/addon/pumpio/pumpio.php:219
+msgid "Enable pump.io Post Plugin"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:20
-msgid "shag"
+#: ../../extend/addon/addon/pumpio/pumpio.php:223
+msgid "Post to pump.io by default"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:20
-msgid "shagged"
+#: ../../extend/addon/addon/pumpio/pumpio.php:227
+msgid "Should posts be public"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:21
-msgid "patent"
+#: ../../extend/addon/addon/pumpio/pumpio.php:231
+msgid "Mirror all public posts"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:21
-msgid "patented"
+#: ../../extend/addon/addon/pumpio/pumpio.php:237
+msgid "Pump.io Post Settings"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:22
-msgid "hug"
+#: ../../extend/addon/addon/pumpio/pumpio.php:266
+msgid "PumpIO Settings saved."
msgstr ""
-#: ../../addon/morepokes/morepokes.php:22
-msgid "hugged"
+#: ../../extend/addon/addon/qrator/qrator.php:48
+msgid "QR code"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:23
-msgid "murder"
+#: ../../extend/addon/addon/qrator/qrator.php:63
+msgid "QR Generator"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:23
-msgid "murdered"
+#: ../../extend/addon/addon/qrator/qrator.php:64
+msgid "Enter some text"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:24
-msgid "worship"
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
+msgid "Enable Rainbowtag"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:24
-msgid "worshipped"
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85
+msgid "Rainbowtag Settings"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:25
-msgid "kiss"
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:101
+msgid "Rainbowtag Settings saved."
msgstr ""
-#: ../../addon/morepokes/morepokes.php:25
-msgid "kissed"
+#: ../../extend/addon/addon/randpost/randpost.php:97
+msgid "You're welcome."
msgstr ""
-#: ../../addon/morepokes/morepokes.php:26
-msgid "tempt"
+#: ../../extend/addon/addon/randpost/randpost.php:98
+msgid "Ah shucks..."
msgstr ""
-#: ../../addon/morepokes/morepokes.php:26
-msgid "tempted"
+#: ../../extend/addon/addon/randpost/randpost.php:99
+msgid "Don't mention it."
msgstr ""
-#: ../../addon/morepokes/morepokes.php:27
-msgid "raise eyebrows at"
+#: ../../extend/addon/addon/randpost/randpost.php:100
+msgid "&lt;blush&gt;"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:27
-msgid "raised their eyebrows at"
+#: ../../extend/addon/addon/redfiles/redfiles.php:119
+msgid "Redmatrix File Storage Import"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:28
-msgid "insult"
+#: ../../extend/addon/addon/redfiles/redfiles.php:120
+msgid "This will import all your Redmatrix cloud files to this channel."
msgstr ""
-#: ../../addon/morepokes/morepokes.php:28
-msgid "insulted"
+#: ../../extend/addon/addon/redfiles/redfiles.php:121
+#: ../../extend/addon/addon/redphotos/redphotos.php:131
+msgid "Redmatrix Server base URL"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:29
-msgid "praise"
+#: ../../extend/addon/addon/redfiles/redfiles.php:122
+#: ../../extend/addon/addon/redphotos/redphotos.php:132
+msgid "Redmatrix Login Username"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:29
-msgid "praised"
+#: ../../extend/addon/addon/redfiles/redfiles.php:123
+#: ../../extend/addon/addon/redphotos/redphotos.php:133
+msgid "Redmatrix Login Password"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:30
-msgid "be dubious of"
+#: ../../extend/addon/addon/redfiles/redfilehelper.php:64
+msgid "file"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:30
-msgid "was dubious of"
+#: ../../extend/addon/addon/redphotos/redphotos.php:106
+msgid "Photos imported"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:31
-msgid "eat"
+#: ../../extend/addon/addon/redphotos/redphotos.php:129
+msgid "Redmatrix Photo Album Import"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:31
-msgid "ate"
+#: ../../extend/addon/addon/redphotos/redphotos.php:130
+msgid "This will import all your Redmatrix photo albums to this channel."
msgstr ""
-#: ../../addon/morepokes/morepokes.php:32
-msgid "giggle and fawn at"
+#: ../../extend/addon/addon/redphotos/redphotos.php:134
+msgid "Import just this album"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:32
-msgid "giggled and fawned at"
+#: ../../extend/addon/addon/redphotos/redphotos.php:134
+msgid "Leave blank to import all albums"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:33
-msgid "doubt"
+#: ../../extend/addon/addon/redphotos/redphotos.php:135
+msgid "Maximum count to import"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:33
-msgid "doubted"
+#: ../../extend/addon/addon/redphotos/redphotos.php:135
+msgid "0 or blank to import all available"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:34
-msgid "glare"
+#: ../../extend/addon/addon/redred/redred.php:45
+msgid "Post to Red"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:34
-msgid "glared at"
+#: ../../extend/addon/addon/redred/redred.php:60
+msgid "Channel is required."
msgstr ""
-#: ../../addon/morepokes/morepokes.php:35
-msgid "fuck"
+#: ../../extend/addon/addon/redred/redred.php:76
+msgid "redred Settings saved."
msgstr ""
-#: ../../addon/morepokes/morepokes.php:35
-msgid "fucked"
+#: ../../extend/addon/addon/redred/redred.php:95
+msgid "Allow posting to another Hubzilla Channel"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:36
-msgid "bonk"
+#: ../../extend/addon/addon/redred/redred.php:99
+msgid "Send public postings to Hubzilla channel by default"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:36
-msgid "bonked"
+#: ../../extend/addon/addon/redred/redred.php:103
+msgid "Hubzilla API Path"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:37
-msgid "declare undying love for"
+#: ../../extend/addon/addon/redred/redred.php:103
+#: ../../extend/addon/addon/rtof/rtof.php:89
+msgid "https://{sitename}/api"
msgstr ""
-#: ../../addon/morepokes/morepokes.php:37
-msgid "declared undying love for"
+#: ../../extend/addon/addon/redred/redred.php:107
+msgid "Hubzilla login name"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../extend/addon/addon/redred/redred.php:111
+msgid "Hubzilla channel name"
+msgstr ""
+
+#: ../../extend/addon/addon/redred/redred.php:111
+#: ../../extend/addon/addon/openid/MysqlProvider.php:54
+msgid "Nickname"
msgstr ""
+#: ../../extend/addon/addon/redred/redred.php:119
+msgid "Hubzilla Crosspost Settings"
+msgstr ""
+
+#: ../../extend/addon/addon/rtof/rtof.php:45
+msgid "Post to Friendica"
+msgstr ""
+
+#: ../../extend/addon/addon/rtof/rtof.php:62
+msgid "rtof Settings saved."
+msgstr ""
+
+#: ../../extend/addon/addon/rtof/rtof.php:81
+msgid "Allow posting to Friendica"
+=======
#: ../../addon/diaspora/diaspora.php:675
msgid "Diaspora Protocol Settings updated."
msgstr ""
@@ -9434,1989 +11062,2186 @@ msgstr ""
#: ../../addon/diaspora/diaspora.php:712
msgid "Diaspora Protocol Settings"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../addon/diaspora/import_diaspora.php:16
-msgid "No username found in import file."
+#: ../../extend/addon/addon/rtof/rtof.php:85
+msgid "Send public postings to Friendica by default"
msgstr ""
-#: ../../addon/diaspora/import_diaspora.php:41 ../../include/import.php:62
-msgid "Unable to create a unique channel address. Import failed."
+#: ../../extend/addon/addon/rtof/rtof.php:89
+msgid "Friendica API Path"
msgstr ""
-#: ../../addon/gitwiki/Mod_Gitwiki.php:107
-msgid "Error retrieving wiki"
+#: ../../extend/addon/addon/rtof/rtof.php:93
+msgid "Friendica login name"
msgstr ""
-#: ../../addon/gitwiki/Mod_Gitwiki.php:114
-msgid "Error creating zip file export folder"
+#: ../../extend/addon/addon/rtof/rtof.php:97
+msgid "Friendica password"
msgstr ""
-#: ../../addon/gitwiki/Mod_Gitwiki.php:132
-msgid "Error downloading wiki: "
+#: ../../extend/addon/addon/rtof/rtof.php:101
+msgid "Hubzilla to Friendica Post Settings"
msgstr ""
-#: ../../addon/testdrive/testdrive.php:104
-#, php-format
-msgid "Your account on %s will expire in a few days."
+#: ../../extend/addon/addon/sendzid/sendzid.php:25
+msgid "Extended Identity Sharing"
msgstr ""
-#: ../../addon/testdrive/testdrive.php:105
-msgid "Your $Productname test account is about to expire."
+#: ../../extend/addon/addon/sendzid/sendzid.php:26
+msgid ""
+"Share your identity with all websites on the internet. When disabled, "
+"identity is only shared with sites in the matrix."
msgstr ""
-#: ../../addon/rainbowtag/rainbowtag.php:81
-msgid "Enable Rainbowtag"
+#: ../../extend/addon/addon/skeleton/skeleton.php:59
+msgid "Some setting"
msgstr ""
-#: ../../addon/rainbowtag/rainbowtag.php:85
-msgid "Rainbowtag Settings"
+#: ../../extend/addon/addon/skeleton/skeleton.php:61
+msgid "A setting"
msgstr ""
-#: ../../addon/rainbowtag/rainbowtag.php:101
-msgid "Rainbowtag Settings saved."
+#: ../../extend/addon/addon/skeleton/skeleton.php:64
+msgid "Skeleton Settings"
msgstr ""
-#: ../../addon/upload_limits/upload_limits.php:25
-msgid "Show Upload Limits"
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
+msgid "Deactivate the feature"
msgstr ""
-#: ../../addon/upload_limits/upload_limits.php:27
-msgid "Hubzilla configured maximum size: "
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
+msgid "Hide the button and show the smilies directly."
msgstr ""
-#: ../../addon/upload_limits/upload_limits.php:28
-msgid "PHP upload_max_filesize: "
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:281
+msgid "Smileybutton Settings"
msgstr ""
-#: ../../addon/upload_limits/upload_limits.php:29
-msgid "PHP post_max_size (must be larger than upload_max_filesize): "
+#: ../../extend/addon/addon/startpage/startpage.php:109
+msgid "Page to load after login"
msgstr ""
-#: ../../addon/visage/visage.php:93
-msgid "Recent Channel/Profile Viewers"
+#: ../../extend/addon/addon/startpage/startpage.php:109
+msgid ""
+"Examples: &quot;apps&quot;, &quot;network?f=&gid=37&quot; (privacy "
+"collection), &quot;channel&quot; or &quot;notifications/system&quot; (leave "
+"blank for default network page (grid)."
msgstr ""
-#: ../../addon/visage/visage.php:98
-msgid "This plugin/addon has not been configured."
+#: ../../extend/addon/addon/startpage/startpage.php:113
+msgid "Startpage Settings"
msgstr ""
-#: ../../addon/visage/visage.php:99
-#, php-format
-msgid "Please visit the Visage settings on %s"
+#: ../../extend/addon/addon/statusnet/statusnet.php:143
+msgid "Post to GNU social"
msgstr ""
-#: ../../addon/visage/visage.php:99
-msgid "your feature settings page"
+#: ../../extend/addon/addon/statusnet/statusnet.php:195
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
msgstr ""
-#: ../../addon/visage/visage.php:112
-msgid "No entries."
+#: ../../extend/addon/addon/statusnet/statusnet.php:232
+msgid "We could not contact the GNU social API with the Path you entered."
msgstr ""
-#: ../../addon/visage/visage.php:166
-msgid "Enable Visage Visitor Logging"
+#: ../../extend/addon/addon/statusnet/statusnet.php:266
+msgid "GNU social settings updated."
msgstr ""
-#: ../../addon/visage/visage.php:170
-msgid "Visage Settings"
+#: ../../extend/addon/addon/statusnet/statusnet.php:310
+msgid "Globally Available GNU social OAuthKeys"
msgstr ""
-#: ../../addon/nsabait/nsabait.php:125
-msgid "Nsabait Settings updated."
+#: ../../extend/addon/addon/statusnet/statusnet.php:312
+msgid ""
+"There are preconfigured OAuth key pairs for some GNU social servers "
+"available. If you are using one of them, please use these credentials.<br /"
+">If not feel free to connect to any other GNU social instance (see below)."
msgstr ""
-#: ../../addon/nsabait/nsabait.php:157
-msgid "Enable NSAbait Plugin"
+#: ../../extend/addon/addon/statusnet/statusnet.php:327
+msgid "Provide your own OAuth Credentials"
msgstr ""
-#: ../../addon/nsabait/nsabait.php:161
-msgid "NSAbait Settings"
+#: ../../extend/addon/addon/statusnet/statusnet.php:329
+msgid ""
+"No consumer key pair for GNU social found. Register your Hubzilla Account as "
+"an desktop client on your GNU social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Hubzilla installation at your favourite GNU social installation."
msgstr ""
-#: ../../addon/mailtest/mailtest.php:19
-msgid "Send test email"
+#: ../../extend/addon/addon/statusnet/statusnet.php:333
+msgid "OAuth Consumer Key"
msgstr ""
-#: ../../addon/mailtest/mailtest.php:50 ../../addon/hubwall/hubwall.php:50
-msgid "No recipients found."
+#: ../../extend/addon/addon/statusnet/statusnet.php:337
+msgid "OAuth Consumer Secret"
msgstr ""
-#: ../../addon/mailtest/mailtest.php:66
-msgid "Mail sent."
+#: ../../extend/addon/addon/statusnet/statusnet.php:341
+msgid "Base API Path"
msgstr ""
-#: ../../addon/mailtest/mailtest.php:68
-msgid "Sending of mail failed."
+#: ../../extend/addon/addon/statusnet/statusnet.php:341
+msgid "Remember the trailing /"
msgstr ""
-#: ../../addon/mailtest/mailtest.php:77
-msgid "Mail Test"
+#: ../../extend/addon/addon/statusnet/statusnet.php:345
+msgid "GNU social application name"
msgstr ""
-#: ../../addon/mailtest/mailtest.php:96 ../../addon/hubwall/hubwall.php:92
-msgid "Message subject"
+#: ../../extend/addon/addon/statusnet/statusnet.php:368
+msgid ""
+"To connect to your GNU social account click the button below to get a "
+"security code from GNU social which you have to copy into the input box "
+"below and submit the form. Only your <strong>public</strong> posts will be "
+"posted to GNU social."
msgstr ""
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:44
-#, php-format
-msgid "Reconnecting %d connections"
+#: ../../extend/addon/addon/statusnet/statusnet.php:370
+msgid "Log in with GNU social"
msgstr ""
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:63
-msgid "Diaspora Reconnect"
+#: ../../extend/addon/addon/statusnet/statusnet.php:373
+msgid "Copy the security code from GNU social here"
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."
+#: ../../extend/addon/addon/statusnet/statusnet.php:383
+msgid "Cancel Connection Process"
msgstr ""
-#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:70
-msgid "Reconnect"
+#: ../../extend/addon/addon/statusnet/statusnet.php:385
+msgid "Current GNU social API is"
msgstr ""
-#: ../../addon/openstreetmap/openstreetmap.php:146
-msgid "View Larger"
+#: ../../extend/addon/addon/statusnet/statusnet.php:389
+msgid "Cancel GNU social Connection"
msgstr ""
-#: ../../addon/openstreetmap/openstreetmap.php:169
-msgid "Tile Server URL"
+#: ../../extend/addon/addon/statusnet/statusnet.php:401
+#: ../../extend/addon/addon/twitter/twitter.php:232
+msgid "Currently connected to: "
msgstr ""
-#: ../../addon/openstreetmap/openstreetmap.php:169
+#: ../../extend/addon/addon/statusnet/statusnet.php:406
msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
-"\">public tile servers</a>"
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
msgstr ""
-#: ../../addon/openstreetmap/openstreetmap.php:170
-msgid "Nominatim (reverse geocoding) Server URL"
+#: ../../extend/addon/addon/statusnet/statusnet.php:411
+msgid "Allow posting to GNU social"
msgstr ""
-#: ../../addon/openstreetmap/openstreetmap.php:170
+#: ../../extend/addon/addon/statusnet/statusnet.php:411
msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target="
-"\"_blank\">Nominatim servers</a>"
+"If enabled your public postings can be posted to the associated GNU-social "
+"account"
msgstr ""
-#: ../../addon/openstreetmap/openstreetmap.php:171
-msgid "Default zoom"
+#: ../../extend/addon/addon/statusnet/statusnet.php:415
+msgid "Post to GNU social by default"
msgstr ""
-#: ../../addon/openstreetmap/openstreetmap.php:171
+#: ../../extend/addon/addon/statusnet/statusnet.php:415
msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
+"If enabled your public postings will be posted to the associated GNU-social "
+"account by default"
msgstr ""
-#: ../../addon/openstreetmap/openstreetmap.php:172
-msgid "Include marker on map"
+#: ../../extend/addon/addon/statusnet/statusnet.php:424
+#: ../../extend/addon/addon/twitter/twitter.php:255
+msgid "Clear OAuth configuration"
msgstr ""
-#: ../../addon/openstreetmap/openstreetmap.php:172
-msgid "Include a marker on the map."
+#: ../../extend/addon/addon/statusnet/statusnet.php:432
+msgid "GNU social Post Settings"
msgstr ""
-#: ../../addon/msgfooter/msgfooter.php:46 ../../addon/xmpp/xmpp.php:91
-msgid "Save Settings"
+#: ../../extend/addon/addon/statusnet/statusnet.php:891
+msgid "API URL"
msgstr ""
-#: ../../addon/msgfooter/msgfooter.php:47
-msgid "text to include in all outgoing posts from this site"
+#: ../../extend/addon/addon/statusnet/statusnet.php:894
+msgid "Application name"
msgstr ""
-#: ../../addon/rtof/rtof.php:45
-msgid "Post to Friendica"
+#: ../../extend/addon/addon/superblock/superblock.php:112
+msgid "Currently blocked"
msgstr ""
-#: ../../addon/rtof/rtof.php:62
-msgid "rtof Settings saved."
+#: ../../extend/addon/addon/superblock/superblock.php:114
+msgid "No channels currently blocked"
msgstr ""
-#: ../../addon/rtof/rtof.php:81
-msgid "Allow posting to Friendica"
+#: ../../extend/addon/addon/superblock/superblock.php:120
+msgid "\"Superblock\" Settings"
msgstr ""
-#: ../../addon/rtof/rtof.php:85
-msgid "Send public postings to Friendica by default"
+#: ../../extend/addon/addon/superblock/superblock.php:345
+msgid "Block Completely"
msgstr ""
-#: ../../addon/rtof/rtof.php:89
-msgid "Friendica API Path"
+#: ../../extend/addon/addon/superblock/superblock.php:394
+msgid "superblock settings updated"
msgstr ""
-#: ../../addon/rtof/rtof.php:89 ../../addon/redred/redred.php:103
-msgid "https://{sitename}/api"
+#: ../../extend/addon/addon/testdrive/testdrive.php:104
+#, php-format
+msgid "Your account on %s will expire in a few days."
msgstr ""
-#: ../../addon/rtof/rtof.php:93
-msgid "Friendica login name"
+#: ../../extend/addon/addon/testdrive/testdrive.php:105
+msgid "Your $Productname test account is about to expire."
msgstr ""
-#: ../../addon/rtof/rtof.php:97
-msgid "Friendica password"
+#: ../../extend/addon/addon/tictac/tictac.php:21
+msgid "Three Dimensional Tic-Tac-Toe"
msgstr ""
-#: ../../addon/rtof/rtof.php:101
-msgid "Hubzilla to Friendica Post Settings"
+#: ../../extend/addon/addon/tictac/tictac.php:54
+msgid "3D Tic-Tac-Toe"
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1153
-#: ../../include/channel.php:1310
+<<<<<<< HEAD
+#: ../../extend/addon/addon/tictac/tictac.php:59
+msgid "New game"
+=======
+#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1139
+#: ../../include/channel.php:1296
msgid "Status:"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:309
-msgid "Activate addon"
+#: ../../extend/addon/addon/tictac/tictac.php:60
+msgid "New game with handicap"
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:313
-msgid "Hide Jappixmini Chat-Widget from the webinterface"
+#: ../../extend/addon/addon/tictac/tictac.php:61
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:318
-msgid "Jabber username"
+#: ../../extend/addon/addon/tictac/tictac.php:62
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:324
-msgid "Jabber server"
+#: ../../extend/addon/addon/tictac/tictac.php:64
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:330
-msgid "Jabber BOSH host URL"
+#: ../../extend/addon/addon/tictac/tictac.php:183
+msgid "You go first..."
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:337
-msgid "Jabber password"
+#: ../../extend/addon/addon/tictac/tictac.php:188
+msgid "I'm going first this time..."
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:343
-msgid "Encrypt Jabber password with Hubzilla password"
+#: ../../extend/addon/addon/tictac/tictac.php:194
+msgid "You won!"
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:347 ../../addon/redred/redred.php:115
-msgid "Hubzilla password"
+#: ../../extend/addon/addon/tictac/tictac.php:200
+#: ../../extend/addon/addon/tictac/tictac.php:225
+msgid "\"Cat\" game!"
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:351
-#: ../../addon/jappixmini/jappixmini.php:355
-msgid "Approve subscription requests from Hubzilla contacts automatically"
+#: ../../extend/addon/addon/tictac/tictac.php:223
+msgid "I won!"
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:359
-msgid "Purge internal list of jabber addresses of contacts"
+#: ../../extend/addon/addon/tour/tour.php:75
+msgid "Edit your profile and change settings."
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:364
-msgid "Configuration Help"
+#: ../../extend/addon/addon/tour/tour.php:76
+msgid "Click here to see activity from your connections."
msgstr ""
-#: ../../addon/jappixmini/jappixmini.php:371
-msgid "Jappix Mini Settings"
+#: ../../extend/addon/addon/tour/tour.php:77
+msgid "Click here to see your channel home."
msgstr ""
-#: ../../addon/superblock/superblock.php:112
-msgid "Currently blocked"
+#: ../../extend/addon/addon/tour/tour.php:78
+msgid "You can access your private messages from here."
msgstr ""
-#: ../../addon/superblock/superblock.php:114
-msgid "No channels currently blocked"
+#: ../../extend/addon/addon/tour/tour.php:79
+msgid "Create new events here."
msgstr ""
-#: ../../addon/superblock/superblock.php:120
-msgid "\"Superblock\" Settings"
+#: ../../extend/addon/addon/tour/tour.php:80
+msgid ""
+"You can accept new connections and change permissions for existing ones "
+"here. You can also e.g. create groups of contacts."
msgstr ""
-#: ../../addon/superblock/superblock.php:345
-msgid "Block Completely"
+#: ../../extend/addon/addon/tour/tour.php:81
+msgid "System notifications will arrive here"
msgstr ""
-#: ../../addon/superblock/superblock.php:394
-msgid "superblock settings updated"
+#: ../../extend/addon/addon/tour/tour.php:82
+msgid "Search for content and users"
msgstr ""
-#: ../../addon/nofed/nofed.php:42
-msgid "Federate"
+#: ../../extend/addon/addon/tour/tour.php:83
+msgid "Browse for new contacts"
msgstr ""
-#: ../../addon/nofed/nofed.php:56
-msgid "nofed Settings saved."
+#: ../../extend/addon/addon/tour/tour.php:84
+msgid "Launch installed apps"
msgstr ""
-#: ../../addon/nofed/nofed.php:72
-msgid "Allow Federation Toggle"
+#: ../../extend/addon/addon/tour/tour.php:85
+msgid "Looking for help? Click here."
msgstr ""
-#: ../../addon/nofed/nofed.php:76
-msgid "Federate posts by default"
+#: ../../extend/addon/addon/tour/tour.php:86
+msgid ""
+"New events have occurred in your network. Click here to see what has "
+"happened!"
msgstr ""
-#: ../../addon/nofed/nofed.php:80
-msgid "NoFed Settings"
+#: ../../extend/addon/addon/tour/tour.php:87
+msgid "You have received a new private message. Click here to see from who!"
msgstr ""
-#: ../../addon/redred/redred.php:45
-msgid "Post to Red"
+#: ../../extend/addon/addon/tour/tour.php:88
+msgid "There are events this week. Click here too see which!"
msgstr ""
-#: ../../addon/redred/redred.php:60
-msgid "Channel is required."
+#: ../../extend/addon/addon/tour/tour.php:89
+msgid "You have received a new introduction. Click here to see who!"
msgstr ""
-#: ../../addon/redred/redred.php:76
-msgid "redred Settings saved."
+#: ../../extend/addon/addon/tour/tour.php:90
+msgid ""
+"There is a new system notification. Click here to see what has happened!"
msgstr ""
-#: ../../addon/redred/redred.php:95
-msgid "Allow posting to another Hubzilla Channel"
+#: ../../extend/addon/addon/tour/tour.php:93
+msgid "Click here to share text, images, videos and sound."
msgstr ""
-#: ../../addon/redred/redred.php:99
-msgid "Send public postings to Hubzilla channel by default"
+#: ../../extend/addon/addon/tour/tour.php:94
+msgid "You can write an optional title for your update (good for long posts)."
msgstr ""
-#: ../../addon/redred/redred.php:103
-msgid "Hubzilla API Path"
+#: ../../extend/addon/addon/tour/tour.php:95
+msgid "Entering some categories here makes it easier to find your post later."
msgstr ""
-#: ../../addon/redred/redred.php:107
-msgid "Hubzilla login name"
+#: ../../extend/addon/addon/tour/tour.php:96
+msgid "Share photos, links, location, etc."
msgstr ""
-#: ../../addon/redred/redred.php:111
-msgid "Hubzilla channel name"
+#: ../../extend/addon/addon/tour/tour.php:97
+msgid ""
+"Only want to share content for a while? Make it expire at a certain date."
msgstr ""
-#: ../../addon/redred/redred.php:119
-msgid "Hubzilla Crosspost Settings"
+#: ../../extend/addon/addon/tour/tour.php:98
+msgid "You can password protect content."
msgstr ""
-#: ../../addon/logrot/logrot.php:36
-msgid "Logfile archive directory"
+#: ../../extend/addon/addon/tour/tour.php:99
+msgid "Choose who you share with."
msgstr ""
-#: ../../addon/logrot/logrot.php:36
-msgid "Directory to store rotated logs"
+#: ../../extend/addon/addon/tour/tour.php:101
+msgid "Click here when you are done."
msgstr ""
-#: ../../addon/logrot/logrot.php:37
-msgid "Logfile size in bytes before rotating"
+#: ../../extend/addon/addon/tour/tour.php:104
+msgid "Adjust from which channels posts should be displayed."
msgstr ""
-#: ../../addon/logrot/logrot.php:38
-msgid "Number of logfiles to retain"
+#: ../../extend/addon/addon/tour/tour.php:105
+msgid "Only show posts from channels in the specified privacy group."
msgstr ""
-#: ../../addon/frphotos/frphotos.php:91
-msgid "Friendica Photo Album Import"
+#: ../../extend/addon/addon/tour/tour.php:109
+msgid ""
+"Easily find posts containing tags (keywords preceded by the \"#\" symbol)."
msgstr ""
-#: ../../addon/frphotos/frphotos.php:92
-msgid "This will import all your Friendica photo albums to this Red channel."
+#: ../../extend/addon/addon/tour/tour.php:110
+msgid "Easily find posts in given category."
msgstr ""
-#: ../../addon/frphotos/frphotos.php:93
-msgid "Friendica Server base URL"
+#: ../../extend/addon/addon/tour/tour.php:111
+msgid "Easily find posts by date."
msgstr ""
-#: ../../addon/frphotos/frphotos.php:94
-msgid "Friendica Login Username"
+#: ../../extend/addon/addon/tour/tour.php:112
+msgid ""
+"Suggested users who have volounteered to be shown as suggestions, and who we "
+"think you might find interesting."
msgstr ""
-#: ../../addon/frphotos/frphotos.php:95
-msgid "Friendica Login Password"
+#: ../../extend/addon/addon/tour/tour.php:113
+msgid "Here you see channels you have connected to."
msgstr ""
-#: ../../addon/donate/donate.php:21
-msgid "Project Servers and Resources"
+#: ../../extend/addon/addon/tour/tour.php:114
+msgid "Save your search so you can repeat it at a later date."
msgstr ""
-#: ../../addon/donate/donate.php:22
-msgid "Project Creator and Tech Lead"
+#: ../../extend/addon/addon/tour/tour.php:117
+msgid ""
+"If you see this icon you can be sure that the sender is who it say it is. It "
+"is normal that it is not always possible to verify the sender, so the icon "
+"will be missing sometimes. There is usually no need to worry about that."
msgstr ""
-#: ../../addon/donate/donate.php:23
-msgid "Admin, developer, directorymin, support bloke"
+#: ../../extend/addon/addon/tour/tour.php:118
+msgid ""
+"Danger! It seems someone tried to forge a message! This message is not "
+"necessarily from who it says it is from!"
msgstr ""
-#: ../../addon/donate/donate.php:50
+#: ../../extend/addon/addon/tour/tour.php:125
msgid ""
-"And the hundreds of other people and organisations who helped make the "
-"Hubzilla possible."
+"Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can "
+"pause it at any time and continue where you left off by reloading the page, "
+"or navigting to another page.</p><p>You can also advance by pressing the "
+"return key"
msgstr ""
-#: ../../addon/donate/donate.php:53
-msgid ""
-"The Redmatrix/Hubzilla projects are provided primarily by volunteers giving "
-"their time and expertise - and often paying out of pocket for services they "
-"share with others."
+#: ../../extend/addon/addon/twitter/twitter.php:99
+msgid "Post to Twitter"
msgstr ""
-#: ../../addon/donate/donate.php:54
-msgid ""
-"There is no corporate funding and no ads, and we do not collect and sell "
-"your personal information. (We don't control your personal information - "
-"<strong>you do</strong>.)"
+#: ../../extend/addon/addon/twitter/twitter.php:154
+msgid "Twitter settings updated."
msgstr ""
-#: ../../addon/donate/donate.php:55
+#: ../../extend/addon/addon/twitter/twitter.php:183
msgid ""
-"Help support our ground-breaking work in decentralisation, web identity, and "
-"privacy."
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
msgstr ""
-#: ../../addon/donate/donate.php:57
+#: ../../extend/addon/addon/twitter/twitter.php:205
msgid ""
-"Your donations keep servers and services running and also helps us to "
-"provide innovative new features and continued development."
+"At this Hubzilla instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input "
+"box below and submit the form. Only your <strong>public</strong> posts will "
+"be posted to Twitter."
msgstr ""
-#: ../../addon/donate/donate.php:60
-msgid "Donate"
+#: ../../extend/addon/addon/twitter/twitter.php:207
+msgid "Log in with Twitter"
+msgstr ""
+
+#: ../../extend/addon/addon/twitter/twitter.php:210
+msgid "Copy the PIN from Twitter here"
msgstr ""
-#: ../../addon/donate/donate.php:62
+#: ../../extend/addon/addon/twitter/twitter.php:237
msgid ""
-"Choose a project, developer, or public hub to support with a one-time "
-"donation"
+"<strong>Note:</strong> Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
msgstr ""
-#: ../../addon/donate/donate.php:63
-msgid "Donate Now"
+#: ../../extend/addon/addon/twitter/twitter.php:242
+msgid "Allow posting to Twitter"
msgstr ""
-#: ../../addon/donate/donate.php:64
+#: ../../extend/addon/addon/twitter/twitter.php:242
msgid ""
-"<strong><em>Or</em></strong> become a project sponsor (Hubzilla Project only)"
+"If enabled your public postings can be posted to the associated Twitter "
+"account"
msgstr ""
-#: ../../addon/donate/donate.php:65
-msgid ""
-"Please indicate if you would like your first name or full name (or nothing) "
-"to appear in our sponsor listing"
+#: ../../extend/addon/addon/twitter/twitter.php:246
+msgid "Send public postings to Twitter by default"
msgstr ""
-#: ../../addon/donate/donate.php:66
-msgid "Sponsor"
+#: ../../extend/addon/addon/twitter/twitter.php:246
+msgid ""
+"If enabled your public postings will be posted to the associated Twitter "
+"account by default"
msgstr ""
-#: ../../addon/donate/donate.php:69
-msgid "Special thanks to: "
+#: ../../extend/addon/addon/twitter/twitter.php:264
+msgid "Twitter Post Settings"
msgstr ""
-#: ../../addon/chords/Mod_Chords.php:44
-msgid ""
-"This is a fairly comprehensive and complete guitar chord dictionary which "
-"will list most of the available ways to play a certain chord, starting from "
-"the base of the fingerboard up to a few frets beyond the twelfth fret "
-"(beyond which everything repeats). A couple of non-standard tunings are "
-"provided for the benefit of slide players, etc."
+#: ../../extend/addon/addon/twitter/twitter.php:773
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:95
+msgid "Submit Settings"
msgstr ""
-#: ../../addon/chords/Mod_Chords.php:46
-msgid ""
-"Chord names start with a root note (A-G) and may include sharps (#) and "
-"flats (b). This software will parse most of the standard naming conventions "
-"such as maj, min, dim, sus(2 or 4), aug, with optional repeating elements."
+#: ../../extend/addon/addon/upload_limits/upload_limits.php:25
+msgid "Show Upload Limits"
msgstr ""
-#: ../../addon/chords/Mod_Chords.php:48
-msgid ""
-"Valid examples include A, A7, Am7, Amaj7, Amaj9, Ammaj7, Aadd4, Asus2Add4, "
-"E7b13b11 ..."
+#: ../../extend/addon/addon/upload_limits/upload_limits.php:27
+msgid "Hubzilla configured maximum size: "
msgstr ""
-#: ../../addon/chords/Mod_Chords.php:51
-msgid "Guitar Chords"
+#: ../../extend/addon/addon/upload_limits/upload_limits.php:28
+msgid "PHP upload_max_filesize: "
msgstr ""
-#: ../../addon/chords/Mod_Chords.php:52
-msgid "The complete online chord dictionary"
+#: ../../extend/addon/addon/upload_limits/upload_limits.php:29
+msgid "PHP post_max_size (must be larger than upload_max_filesize): "
msgstr ""
-#: ../../addon/chords/Mod_Chords.php:57
-msgid "Tuning"
+#: ../../extend/addon/addon/visage/visage.php:93
+msgid "Recent Channel/Profile Viewers"
msgstr ""
-#: ../../addon/chords/Mod_Chords.php:58
-msgid "Chord name: example: Em7"
+#: ../../extend/addon/addon/visage/visage.php:98
+msgid "This plugin/addon has not been configured."
msgstr ""
-#: ../../addon/chords/Mod_Chords.php:59
-msgid "Show for left handed stringing"
+#: ../../extend/addon/addon/visage/visage.php:99
+#, php-format
+msgid "Please visit the Visage settings on %s"
msgstr ""
-#: ../../addon/chords/chords.php:33
-msgid "Quick Reference"
+#: ../../extend/addon/addon/visage/visage.php:99
+msgid "your feature settings page"
msgstr ""
-#: ../../addon/libertree/libertree.php:38
-msgid "Post to Libertree"
+#: ../../extend/addon/addon/visage/visage.php:112
+msgid "No entries."
msgstr ""
-#: ../../addon/libertree/libertree.php:69
-msgid "Enable Libertree Post Plugin"
+#: ../../extend/addon/addon/visage/visage.php:166
+msgid "Enable Visage Visitor Logging"
msgstr ""
-#: ../../addon/libertree/libertree.php:73
-msgid "Libertree API token"
+#: ../../extend/addon/addon/visage/visage.php:170
+msgid "Visage Settings"
msgstr ""
-#: ../../addon/libertree/libertree.php:77
-msgid "Libertree site URL"
+#: ../../extend/addon/addon/wholikesme/wholikesme.php:29
+msgid "Who likes me?"
msgstr ""
-#: ../../addon/libertree/libertree.php:81
-msgid "Post to Libertree by default"
+#: ../../extend/addon/addon/wppost/wppost.php:45
+msgid "Post to WordPress"
msgstr ""
-#: ../../addon/libertree/libertree.php:85
-msgid "Libertree Post Settings"
+#: ../../extend/addon/addon/wppost/wppost.php:82
+msgid "Enable WordPress Post Plugin"
msgstr ""
-#: ../../addon/libertree/libertree.php:99
-msgid "Libertree Settings saved."
+#: ../../extend/addon/addon/wppost/wppost.php:86
+msgid "WordPress username"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:45
-msgid "Flattr this!"
+#: ../../extend/addon/addon/wppost/wppost.php:90
+msgid "WordPress password"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:83
-msgid "Flattr widget settings updated."
+#: ../../extend/addon/addon/wppost/wppost.php:94
+msgid "WordPress API URL"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:100
-msgid "Flattr user"
+#: ../../extend/addon/addon/wppost/wppost.php:95
+msgid "Typically https://your-blog.tld/xmlrpc.php"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:104
-msgid "URL of the Thing to flattr"
+#: ../../extend/addon/addon/wppost/wppost.php:98
+msgid "WordPress blogid"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:104
-msgid "If empty channel URL is used"
+#: ../../extend/addon/addon/wppost/wppost.php:99
+msgid "For multi-user sites such as wordpress.com, otherwise leave blank"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:108
-msgid "Title of the Thing to flattr"
+#: ../../extend/addon/addon/wppost/wppost.php:105
+msgid "Post to WordPress by default"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:108
-msgid "If empty \"channel name on The Hubzilla\" will be used"
+#: ../../extend/addon/addon/wppost/wppost.php:109
+msgid "Forward comments (requires hubzilla_wp plugin)"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:112
-msgid "Static or dynamic flattr button"
+#: ../../extend/addon/addon/wppost/wppost.php:113
+msgid "WordPress Post Settings"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:112
-msgid "static"
+#: ../../extend/addon/addon/wppost/wppost.php:129
+msgid "Wordpress Settings saved."
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:112
-msgid "dynamic"
+#: ../../extend/addon/addon/xmpp/xmpp.php:31
+msgid "XMPP settings updated."
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:116
-msgid "Alignment of the widget"
+#: ../../extend/addon/addon/xmpp/xmpp.php:53
+msgid "Enable Chat"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:116
-msgid "left"
+#: ../../extend/addon/addon/xmpp/xmpp.php:58
+msgid "Individual credentials"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:116
-msgid "right"
+#: ../../extend/addon/addon/xmpp/xmpp.php:64
+msgid "Jabber BOSH server"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:120
-msgid "Enable Flattr widget"
+#: ../../extend/addon/addon/xmpp/xmpp.php:69
+msgid "XMPP Settings"
msgstr ""
-#: ../../addon/flattrwidget/flattrwidget.php:124
-msgid "Flattr Widget Settings"
+#: ../../extend/addon/addon/xmpp/xmpp.php:92
+msgid "Jabber BOSH host"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:143
-msgid "Post to GNU social"
+#: ../../extend/addon/addon/xmpp/xmpp.php:93
+msgid "Use central userbase"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:195
+#: ../../extend/addon/addon/xmpp/xmpp.php:93
msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
+"If enabled, members will automatically login to an ejabberd server that has "
+"to be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
msgstr ""
-#: ../../addon/statusnet/statusnet.php:232
-msgid "We could not contact the GNU social API with the Path you entered."
+#: ../../extend/addon/addon/cdav/include/widgets.php:37
+msgid "Select Channel"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:266
-msgid "GNU social settings updated."
+#: ../../extend/addon/addon/cdav/include/widgets.php:42
+msgid "Read-write"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:310
-msgid "Globally Available GNU social OAuthKeys"
+#: ../../extend/addon/addon/cdav/include/widgets.php:43
+msgid "Read-only"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:312
-msgid ""
-"There are preconfigured OAuth key pairs for some GNU social servers "
-"available. If you are using one of them, please use these credentials.<br /"
-">If not feel free to connect to any other GNU social instance (see below)."
+#: ../../extend/addon/addon/cdav/include/widgets.php:116
+msgid "My Calendars"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:327
-msgid "Provide your own OAuth Credentials"
+#: ../../extend/addon/addon/cdav/include/widgets.php:118
+msgid "Shared Calendars"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:329
-msgid ""
-"No consumer key pair for GNU social found. Register your Hubzilla Account as "
-"an desktop client on your GNU social account, copy the consumer key pair "
-"here and enter the API base root.<br />Before you register your own OAuth "
-"key pair ask the administrator if there is already a key pair for this "
-"Hubzilla installation at your favourite GNU social installation."
+#: ../../extend/addon/addon/cdav/include/widgets.php:122
+msgid "Share this calendar"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:333
-msgid "OAuth Consumer Key"
+#: ../../extend/addon/addon/cdav/include/widgets.php:124
+msgid "Calendar name and color"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:337
-msgid "OAuth Consumer Secret"
+#: ../../extend/addon/addon/cdav/include/widgets.php:126
+msgid "Create new calendar"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:341
-msgid "Base API Path"
+#: ../../extend/addon/addon/cdav/include/widgets.php:128
+msgid "Calendar Name"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:341
-msgid "Remember the trailing /"
+#: ../../extend/addon/addon/cdav/include/widgets.php:129
+msgid "Calendar Tools"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:345
-msgid "GNU social application name"
+#: ../../extend/addon/addon/cdav/include/widgets.php:130
+msgid "Import calendar"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:368
-msgid ""
-"To connect to your GNU social account click the button below to get a "
-"security code from GNU social which you have to copy into the input box "
-"below and submit the form. Only your <strong>public</strong> posts will be "
-"posted to GNU social."
+#: ../../extend/addon/addon/cdav/include/widgets.php:131
+msgid "Select a calendar to import to"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:370
-msgid "Log in with GNU social"
+#: ../../extend/addon/addon/cdav/include/widgets.php:158
+msgid "Addressbooks"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:373
-msgid "Copy the security code from GNU social here"
+#: ../../extend/addon/addon/cdav/include/widgets.php:160
+msgid "Addressbook name"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:383
-msgid "Cancel Connection Process"
+#: ../../extend/addon/addon/cdav/include/widgets.php:162
+msgid "Create new addressbook"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:385
-msgid "Current GNU social API is"
+#: ../../extend/addon/addon/cdav/include/widgets.php:163
+msgid "Addressbook Name"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:389
-msgid "Cancel GNU social Connection"
+#: ../../extend/addon/addon/cdav/include/widgets.php:165
+msgid "Addressbook Tools"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:401 ../../addon/twitter/twitter.php:232
-msgid "Currently connected to: "
+#: ../../extend/addon/addon/cdav/include/widgets.php:166
+msgid "Import addressbook"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:406
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
+#: ../../extend/addon/addon/cdav/include/widgets.php:167
+msgid "Select an addressbook to import to"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:411
-msgid "Allow posting to GNU social"
+#: ../../extend/addon/addon/cdav/cdav.php:36
+msgid "Errors encountered creating database table: "
msgstr ""
-#: ../../addon/statusnet/statusnet.php:411
-msgid ""
-"If enabled your public postings can be posted to the associated GNU-social "
-"account"
+#: ../../extend/addon/addon/cdav/cdav.php:197
+msgid "Default Calendar"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:415
-msgid "Post to GNU social by default"
+#: ../../extend/addon/addon/cdav/cdav.php:206
+msgid "Default Addressbook"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:415
-msgid ""
-"If enabled your public postings will be posted to the associated GNU-social "
-"account by default"
+#: ../../extend/addon/addon/cdav/cdav.php:215
+msgid "CalDAV/CardDAV Settings saved."
msgstr ""
-#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:255
-msgid "Clear OAuth configuration"
+#: ../../extend/addon/addon/cdav/cdav.php:234
+msgid "Enable CalDAV/CardDAV Server for this channel"
msgstr ""
-#: ../../addon/statusnet/statusnet.php:432
-msgid "GNU social Post Settings"
+#: ../../extend/addon/addon/cdav/cdav.php:237
+#, php-format
+msgid "Your CalDAV resources are located at %s "
msgstr ""
-#: ../../addon/statusnet/statusnet.php:891
-msgid "API URL"
+#: ../../extend/addon/addon/cdav/cdav.php:240
+#, php-format
+msgid "Your CardDAV resources are located at %s "
msgstr ""
-#: ../../addon/statusnet/statusnet.php:894
-msgid "Application name"
+#: ../../extend/addon/addon/cdav/cdav.php:246
+msgid "CalDAV/CardDAV Settings"
msgstr ""
-#: ../../addon/qrator/qrator.php:48
-msgid "QR code"
+#: ../../extend/addon/addon/cdav/cdav.php:272
+#: ../../include/connections.php:670
+msgid "Home, Voice"
msgstr ""
-#: ../../addon/qrator/qrator.php:63
-msgid "QR Generator"
+#: ../../extend/addon/addon/cdav/cdav.php:273
+#: ../../include/connections.php:671
+msgid "Home, Fax"
msgstr ""
-#: ../../addon/qrator/qrator.php:64
-msgid "Enter some text"
+#: ../../extend/addon/addon/cdav/cdav.php:275
+#: ../../include/connections.php:673
+msgid "Work, Voice"
msgstr ""
-#: ../../addon/chess/chess.php:276 ../../addon/chess/chess.php:433
-msgid "Invalid game."
+#: ../../extend/addon/addon/cdav/cdav.php:276
+#: ../../include/connections.php:674
+msgid "Work, Fax"
msgstr ""
-#: ../../addon/chess/chess.php:282 ../../addon/chess/chess.php:439
-msgid "You are not a player in this game."
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:744
+msgid "INVALID EVENT DISMISSED!"
msgstr ""
-#: ../../addon/chess/chess.php:315
-msgid "You must be a local channel to create a game."
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:745
+msgid "Summary: "
msgstr ""
-#: ../../addon/chess/chess.php:333
-msgid "You must select one opponent that is not yourself."
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:746
+msgid "Date: "
msgstr ""
-#: ../../addon/chess/chess.php:336
-msgid "Creating new game..."
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:747
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:754
+msgid "Reason: "
msgstr ""
-#: ../../addon/chess/chess.php:342
-msgid "You must select white or black."
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:752
+msgid "INVALID CARD DISMISSED!"
msgstr ""
-#: ../../addon/chess/chess.php:349
-msgid "Error creating new game."
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:753
+msgid "Name: "
msgstr ""
-#: ../../addon/chess/chess.php:381 ../../include/channel.php:913
+<<<<<<< HEAD
+#: ../../extend/addon/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."
+=======
+#: ../../addon/chess/chess.php:381 ../../include/channel.php:899
msgid "Requested channel is not available."
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../addon/chess/chess.php:395
-msgid "You must select a local channel /chess/channelname"
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:837
+msgid "Example: YYYY-MM-DD HH:mm"
msgstr ""
-#: ../../addon/chess/chess.php:923
-msgid "Enable notifications"
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:837
+msgid "End date and time"
msgstr ""
-#: ../../addon/twitter/twitter.php:99
-msgid "Post to Twitter"
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:852
+msgid "List month"
msgstr ""
-#: ../../addon/twitter/twitter.php:154
-msgid "Twitter settings updated."
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:853
+msgid "List week"
msgstr ""
-#: ../../addon/twitter/twitter.php:183
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:854
+msgid "List day"
msgstr ""
-#: ../../addon/twitter/twitter.php:205
-msgid ""
-"At this Hubzilla instance the Twitter plugin was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input "
-"box below and submit the form. Only your <strong>public</strong> posts will "
-"be posted to Twitter."
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:861
+msgid "More"
msgstr ""
-#: ../../addon/twitter/twitter.php:207
-msgid "Log in with Twitter"
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:862
+msgid "Less"
msgstr ""
-#: ../../addon/twitter/twitter.php:210
-msgid "Copy the PIN from Twitter here"
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:863
+msgid "Select calendar"
msgstr ""
-#: ../../addon/twitter/twitter.php:237
-msgid ""
-"<strong>Note:</strong> Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to Twitter will lead the visitor to a blank page informing "
-"the visitor that the access to your profile has been restricted."
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:865
+msgid "Delete all"
msgstr ""
-#: ../../addon/twitter/twitter.php:242
-msgid "Allow posting to Twitter"
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:867
+msgid "Sorry! Editing of recurrent events is not yet implemented."
msgstr ""
-#: ../../addon/twitter/twitter.php:242
-msgid ""
-"If enabled your public postings can be posted to the associated Twitter "
-"account"
+#: ../../extend/addon/addon/chess/chess.php:276
+#: ../../extend/addon/addon/chess/chess.php:433
+msgid "Invalid game."
msgstr ""
-#: ../../addon/twitter/twitter.php:246
-msgid "Send public postings to Twitter by default"
+#: ../../extend/addon/addon/chess/chess.php:282
+#: ../../extend/addon/addon/chess/chess.php:439
+msgid "You are not a player in this game."
msgstr ""
-#: ../../addon/twitter/twitter.php:246
-msgid ""
-"If enabled your public postings will be posted to the associated Twitter "
-"account by default"
+#: ../../extend/addon/addon/chess/chess.php:315
+msgid "You must be a local channel to create a game."
msgstr ""
-#: ../../addon/twitter/twitter.php:264
-msgid "Twitter Post Settings"
+#: ../../extend/addon/addon/chess/chess.php:333
+msgid "You must select one opponent that is not yourself."
msgstr ""
-#: ../../addon/smileybutton/smileybutton.php:211
-msgid "Deactivate the feature"
+#: ../../extend/addon/addon/chess/chess.php:336
+msgid "Creating new game..."
msgstr ""
-#: ../../addon/smileybutton/smileybutton.php:215
-msgid "Hide the button and show the smilies directly."
+#: ../../extend/addon/addon/chess/chess.php:342
+msgid "You must select white or black."
msgstr ""
-#: ../../addon/smileybutton/smileybutton.php:219
-msgid "Smileybutton Settings"
+#: ../../extend/addon/addon/chess/chess.php:349
+msgid "Error creating new game."
msgstr ""
-#: ../../addon/piwik/piwik.php:85
-msgid ""
-"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
-"analytics tool."
+#: ../../extend/addon/addon/chess/chess.php:381 ../../include/channel.php:898
+msgid "Requested channel is not available."
msgstr ""
-#: ../../addon/piwik/piwik.php:88
-#, php-format
-msgid ""
-"If you do not want that your visits are logged this way you <a href='%s'>can "
-"set a cookie to prevent Piwik from tracking further visits of the site</a> "
-"(opt-out)."
+#: ../../extend/addon/addon/chess/chess.php:395
+msgid "You must select a local channel /chess/channelname"
msgstr ""
-#: ../../addon/piwik/piwik.php:96
-msgid "Piwik Base URL"
+#: ../../extend/addon/addon/chess/chess.php:923
+msgid "Enable notifications"
msgstr ""
-#: ../../addon/piwik/piwik.php:96
-msgid ""
-"Absolute path to your Piwik installation. (without protocol (http/s), with "
-"trailing slash)"
+#: ../../extend/addon/addon/likebanner/likebanner.php:51
+msgid "Your Webbie:"
msgstr ""
-#: ../../addon/piwik/piwik.php:97
-msgid "Site ID"
+#: ../../extend/addon/addon/likebanner/likebanner.php:54
+msgid "Fontsize (px):"
msgstr ""
-#: ../../addon/piwik/piwik.php:98
-msgid "Show opt-out cookie link?"
+#: ../../extend/addon/addon/likebanner/likebanner.php:68
+msgid "Link:"
msgstr ""
-#: ../../addon/piwik/piwik.php:99
-msgid "Asynchronous tracking"
+#: ../../extend/addon/addon/likebanner/likebanner.php:70
+msgid "Like us on Hubzilla"
msgstr ""
-#: ../../addon/piwik/piwik.php:100
-msgid "Enable frontend JavaScript error tracking"
+#: ../../extend/addon/addon/likebanner/likebanner.php:72
+msgid "Embed:"
msgstr ""
-#: ../../addon/piwik/piwik.php:100
-msgid "This feature requires Piwik >= 2.2.0"
+#: ../../extend/addon/addon/openid/Mod_Id.php:85
+#: ../../include/selectors.php:49 ../../include/selectors.php:66
+msgid "Male"
msgstr ""
-#: ../../addon/tour/tour.php:75
-msgid "Edit your profile and change settings."
+#: ../../extend/addon/addon/openid/Mod_Id.php:87
+#: ../../include/selectors.php:49 ../../include/selectors.php:66
+msgid "Female"
msgstr ""
-#: ../../addon/tour/tour.php:76
-msgid "Click here to see activity from your connections."
+#: ../../extend/addon/addon/openid/MysqlProvider.php:52
+msgid "First Name"
msgstr ""
-#: ../../addon/tour/tour.php:77
-msgid "Click here to see your channel home."
+#: ../../extend/addon/addon/openid/MysqlProvider.php:53
+msgid "Last Name"
msgstr ""
-#: ../../addon/tour/tour.php:78
-msgid "You can access your private messages from here."
+#: ../../extend/addon/addon/openid/MysqlProvider.php:55
+msgid "Full Name"
msgstr ""
-#: ../../addon/tour/tour.php:79
-msgid "Create new events here."
+#: ../../extend/addon/addon/openid/MysqlProvider.php:61
+msgid "Profile Photo 16px"
msgstr ""
-#: ../../addon/tour/tour.php:80
-msgid ""
-"You can accept new connections and change permissions for existing ones "
-"here. You can also e.g. create groups of contacts."
+#: ../../extend/addon/addon/openid/MysqlProvider.php:62
+msgid "Profile Photo 32px"
msgstr ""
-#: ../../addon/tour/tour.php:81
-msgid "System notifications will arrive here"
+#: ../../extend/addon/addon/openid/MysqlProvider.php:63
+msgid "Profile Photo 48px"
msgstr ""
-#: ../../addon/tour/tour.php:82
-msgid "Search for content and users"
+#: ../../extend/addon/addon/openid/MysqlProvider.php:64
+msgid "Profile Photo 64px"
msgstr ""
-#: ../../addon/tour/tour.php:83
-msgid "Browse for new contacts"
+#: ../../extend/addon/addon/openid/MysqlProvider.php:65
+msgid "Profile Photo 80px"
msgstr ""
-#: ../../addon/tour/tour.php:84
-msgid "Launch installed apps"
+#: ../../extend/addon/addon/openid/MysqlProvider.php:66
+msgid "Profile Photo 128px"
msgstr ""
-#: ../../addon/tour/tour.php:85
-msgid "Looking for help? Click here."
+#: ../../extend/addon/addon/openid/MysqlProvider.php:67
+msgid "Timezone"
msgstr ""
-#: ../../addon/tour/tour.php:86
-msgid ""
-"New events have occurred in your network. Click here to see what has "
-"happened!"
+#: ../../extend/addon/addon/openid/MysqlProvider.php:70
+msgid "Birth Year"
msgstr ""
-#: ../../addon/tour/tour.php:87
-msgid "You have received a new private message. Click here to see from who!"
+#: ../../extend/addon/addon/openid/MysqlProvider.php:71
+msgid "Birth Month"
msgstr ""
-#: ../../addon/tour/tour.php:88
-msgid "There are events this week. Click here too see which!"
+#: ../../extend/addon/addon/openid/MysqlProvider.php:72
+msgid "Birth Day"
msgstr ""
-#: ../../addon/tour/tour.php:89
-msgid "You have received a new introduction. Click here to see who!"
+#: ../../extend/addon/addon/openid/MysqlProvider.php:73
+msgid "Birthdate"
msgstr ""
-#: ../../addon/tour/tour.php:90
+#: ../../extend/addon/addon/openid/openid.php:49
msgid ""
-"There is a new system notification. Click here to see what has happened!"
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
msgstr ""
-#: ../../addon/tour/tour.php:93
-msgid "Click here to share text, images, videos and sound."
+#: ../../extend/addon/addon/openid/openid.php:49
+msgid "The error message was:"
msgstr ""
-#: ../../addon/tour/tour.php:94
-msgid "You can write an optional title for your update (good for long posts)."
+#: ../../extend/addon/addon/openid/Mod_Openid.php:30
+msgid "OpenID protocol error. No ID returned."
msgstr ""
-#: ../../addon/tour/tour.php:95
-msgid "Entering some categories here makes it easier to find your post later."
+#: ../../extend/addon/addon/openid/Mod_Openid.php:188
+#: ../../include/auth.php:286
+msgid "Login failed."
msgstr ""
-#: ../../addon/tour/tour.php:96
-msgid "Share photos, links, location, etc."
+#: ../../extend/addon/addon/mailtest/mailtest.php:19
+msgid "Send test email"
msgstr ""
-#: ../../addon/tour/tour.php:97
-msgid ""
-"Only want to share content for a while? Make it expire at a certain date."
+#: ../../extend/addon/addon/mailtest/mailtest.php:66
+msgid "Mail sent."
msgstr ""
-#: ../../addon/tour/tour.php:98
-msgid "You can password protect content."
+#: ../../extend/addon/addon/mailtest/mailtest.php:68
+msgid "Sending of mail failed."
msgstr ""
-#: ../../addon/tour/tour.php:99
-msgid "Choose who you share with."
+#: ../../extend/addon/addon/mailtest/mailtest.php:77
+msgid "Mail Test"
msgstr ""
-#: ../../addon/tour/tour.php:101
-msgid "Click here when you are done."
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:57
+msgid "Errors encountered deleting database table "
msgstr ""
-#: ../../addon/tour/tour.php:104
-msgid "Adjust from which channels posts should be displayed."
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:96
+msgid "Drop tables when uninstalling?"
msgstr ""
-#: ../../addon/tour/tour.php:105
-msgid "Only show posts from channels in the specified privacy group."
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:96
+msgid ""
+"If checked, the Rendezvous database tables will be deleted when the plugin "
+"is uninstalled."
+msgstr ""
+
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:97
+msgid "Mapbox Access Token"
msgstr ""
-#: ../../addon/tour/tour.php:109
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:97
msgid ""
-"Easily find posts containing tags (keywords preceded by the \"#\" symbol)."
+"If you enter a Mapbox access token, it will be used to retrieve map tiles "
+"from Mapbox instead of the default OpenStreetMap tile server."
msgstr ""
-#: ../../addon/tour/tour.php:110
-msgid "Easily find posts in given category."
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:162
+msgid "Rendezvous"
msgstr ""
-#: ../../addon/tour/tour.php:111
-msgid "Easily find posts by date."
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:167
+msgid ""
+"This identity has been deleted by another member due to inactivity. Please "
+"press the \"New identity\" button or refresh the page to register a new "
+"identity. You may use the same name."
+msgstr ""
+
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:168
+msgid "Welcome to Rendezvous!"
msgstr ""
-#: ../../addon/tour/tour.php:112
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:169
msgid ""
-"Suggested users who have volounteered to be shown as suggestions, and who we "
-"think you might find interesting."
+"Enter your name to join this rendezvous. To begin sharing your location with "
+"the other members, tap the GPS control. When your location is discovered, a "
+"red dot will appear and others will be able to see you on the map."
msgstr ""
-#: ../../addon/tour/tour.php:113
-msgid "Here you see channels you have connected to."
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:171
+msgid "Let's meet here"
msgstr ""
-#: ../../addon/tour/tour.php:114
-msgid "Save your search so you can repeat it at a later date."
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:174
+msgid "New marker"
msgstr ""
-#: ../../addon/tour/tour.php:117
-msgid ""
-"If you see this icon you can be sure that the sender is who it say it is. It "
-"is normal that it is not always possible to verify the sender, so the icon "
-"will be missing sometimes. There is usually no need to worry about that."
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:175
+msgid "Edit marker"
msgstr ""
-#: ../../addon/tour/tour.php:118
-msgid ""
-"Danger! It seems someone tried to forge a message! This message is not "
-"necessarily from who it says it is from!"
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:176
+msgid "New identity"
msgstr ""
-#: ../../addon/tour/tour.php:125
-msgid ""
-"Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can "
-"pause it at any time and continue where you left off by reloading the page, "
-"or navigting to another page.</p><p>You can also advance by pressing the "
-"return key"
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:177
+msgid "Delete marker"
msgstr ""
-#: ../../addon/sendzid/sendzid.php:25
-msgid "Extended Identity Sharing"
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:178
+msgid "Delete member"
msgstr ""
-#: ../../addon/sendzid/sendzid.php:26
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:179
+msgid "Edit proximity alert"
+msgstr ""
+
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:180
msgid ""
-"Share your identity with all websites on the internet. When disabled, "
-"identity is only shared with sites in the matrix."
+"A proximity alert will be issued when this member is within a certain radius "
+"of you.<br><br>Enter a radius in meters (0 to disable):"
msgstr ""
-#: ../../addon/tictac/tictac.php:21
-msgid "Three Dimensional Tic-Tac-Toe"
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:180
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:185
+msgid "distance"
msgstr ""
-#: ../../addon/tictac/tictac.php:54
-msgid "3D Tic-Tac-Toe"
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:181
+msgid "Proximity alert distance (meters)"
msgstr ""
-#: ../../addon/tictac/tictac.php:59
-msgid "New game"
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:182
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:184
+msgid ""
+"A proximity alert will be issued when you are within a certain radius of the "
+"marker location.<br><br>Enter a radius in meters (0 to disable):"
msgstr ""
-#: ../../addon/tictac/tictac.php:60
-msgid "New game with handicap"
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:183
+msgid "Marker proximity alert"
msgstr ""
-#: ../../addon/tictac/tictac.php:61
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:186
+msgid "Reminder note"
msgstr ""
-#: ../../addon/tictac/tictac.php:62
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:187
msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
+"Enter a note to be displayed when you are within the specified proximity..."
msgstr ""
-#: ../../addon/tictac/tictac.php:64
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:199
+msgid "Add new rendezvous"
msgstr ""
-#: ../../addon/tictac/tictac.php:183
-msgid "You go first..."
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:200
+msgid ""
+"Create a new rendezvous and share the access link with those you wish to "
+"invite to the group. Those who open the link become members of the "
+"rendezvous. They can view other member locations, add markers to the map, or "
+"share their own locations with the group."
msgstr ""
-#: ../../addon/tictac/tictac.php:188
-msgid "I'm going first this time..."
+#: ../../extend/addon/addon/firefox/firefox.php:23
+msgid "Install Firefox Sharing Tools"
msgstr ""
-#: ../../addon/tictac/tictac.php:194
-msgid "You won!"
+#: ../../extend/addon/addon/firefox/firefox.php:34
+msgid "Share content from Firefox to $Projectname"
msgstr ""
-#: ../../addon/tictac/tictac.php:200 ../../addon/tictac/tictac.php:225
-msgid "\"Cat\" game!"
+#: ../../extend/addon/addon/firefox/firefox.php:37
+msgid "Install Firefox Sharing Tools to this web browser"
msgstr ""
-#: ../../addon/tictac/tictac.php:223
-msgid "I won!"
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:107
+msgid "Error retrieving wiki"
msgstr ""
-#: ../../addon/pageheader/pageheader.php:43
-msgid "Message to display on every page on this server"
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:114
+msgid "Error creating zip file export folder"
msgstr ""
-#: ../../addon/pageheader/pageheader.php:48
-msgid "Pageheader Settings"
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:132
+msgid "Error downloading wiki: "
msgstr ""
-#: ../../addon/pageheader/pageheader.php:64
-msgid "pageheader Settings saved."
+#: ../../extend/addon/addon/opensearch/opensearch.php:26
+#, php-format
+msgctxt "opensearch"
+msgid "Search %1$s (%2$s)"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:19
-msgid "lonely"
+#: ../../extend/addon/addon/opensearch/opensearch.php:28
+msgctxt "opensearch"
+msgid "$Projectname"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:20
-msgid "drunk"
+#: ../../extend/addon/addon/opensearch/opensearch.php:43
+msgid "Search $Projectname"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:21
-msgid "horny"
+#: ../../include/dba/dba_driver.php:189
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:22
-msgid "stoned"
+#: ../../include/language.php:367 ../../include/text.php:1787
+msgid "default"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:23
-msgid "fucked up"
+#: ../../include/language.php:380
+msgid "Select an alternate language"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:24
-msgid "clusterfucked"
+#: ../../include/import.php:41
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
msgstr ""
-#: ../../addon/moremoods/moremoods.php:25
-msgid "crazy"
+#: ../../include/import.php:62
+msgid "Unable to create a unique channel address. Import failed."
msgstr ""
-#: ../../addon/moremoods/moremoods.php:26
-msgid "hurt"
+#: ../../include/import.php:105
+msgid "Cloned channel not found. Import failed."
msgstr ""
-#: ../../addon/moremoods/moremoods.php:27
-msgid "sleepy"
+#: ../../include/photos.php:111
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:28
-msgid "grumpy"
+#: ../../include/photos.php:118
+msgid "Image file is empty."
msgstr ""
-#: ../../addon/moremoods/moremoods.php:29
-msgid "high"
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
msgstr ""
-#: ../../addon/moremoods/moremoods.php:30
-msgid "semi-conscious"
+#: ../../include/photos.php:297
+msgid "a new photo"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:31
-msgid "in love"
+#: ../../include/photos.php:301
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:32
-msgid "in lust"
+#: ../../include/photos.php:524 ../../include/conversation.php:1777
+msgid "Photo Albums"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:33
-msgid "naked"
+#: ../../include/photos.php:529
+msgid "Upload New Photos"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:34
-msgid "stinky"
+#: ../../include/account.php:35
+msgid "Not a valid email address"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:35
-msgid "sweaty"
+#: ../../include/account.php:37
+msgid "Your email domain is not among those allowed on this site"
msgstr ""
-#: ../../addon/moremoods/moremoods.php:36
-msgid "bleeding out"
+#: ../../include/account.php:43
+msgid "Your email address is already registered at this site."
msgstr ""
-#: ../../addon/moremoods/moremoods.php:37
-msgid "victorious"
+#: ../../include/account.php:75
+msgid "An invitation is required."
msgstr ""
-#: ../../addon/moremoods/moremoods.php:38
-msgid "defeated"
+#: ../../include/account.php:79
+msgid "Invitation could not be verified."
msgstr ""
-#: ../../addon/moremoods/moremoods.php:39
-msgid "envious"
+#: ../../include/account.php:130
+msgid "Please enter the required information."
msgstr ""
-#: ../../addon/moremoods/moremoods.php:40
-msgid "jealous"
+#: ../../include/account.php:198
+msgid "Failed to store account information."
msgstr ""
-#: ../../addon/xmpp/xmpp.php:31
-msgid "XMPP settings updated."
+#: ../../include/account.php:263
+#, php-format
+msgid "Registration confirmation for %s"
msgstr ""
-#: ../../addon/xmpp/xmpp.php:53
-msgid "Enable Chat"
+#: ../../include/account.php:330
+#, php-format
+msgid "Registration request at %s"
msgstr ""
-#: ../../addon/xmpp/xmpp.php:58
-msgid "Individual credentials"
+#: ../../include/account.php:352
+msgid "your registration password"
msgstr ""
-#: ../../addon/xmpp/xmpp.php:64
-msgid "Jabber BOSH server"
+#: ../../include/account.php:358 ../../include/account.php:420
+#, php-format
+msgid "Registration details for %s"
msgstr ""
-#: ../../addon/xmpp/xmpp.php:69
-msgid "XMPP Settings"
+#: ../../include/account.php:431
+msgid "Account approved."
msgstr ""
-#: ../../addon/xmpp/xmpp.php:92
-msgid "Jabber BOSH host"
+#: ../../include/account.php:471
+#, php-format
+msgid "Registration revoked for %s"
msgstr ""
-#: ../../addon/xmpp/xmpp.php:93
-msgid "Use central userbase"
+#: ../../include/account.php:756 ../../include/account.php:758
+msgid "Click here to upgrade."
msgstr ""
-#: ../../addon/xmpp/xmpp.php:93
-msgid ""
-"If enabled, members will automatically login to an ejabberd server that has "
-"to be installed on this machine with synchronized credentials via the "
-"\"auth_ejabberd.php\" script."
+#: ../../include/account.php:764
+msgid "This action exceeds the limits set by your subscription plan."
msgstr ""
-#: ../../addon/wholikesme/wholikesme.php:29
-msgid "Who likes me?"
+#: ../../include/account.php:769
+msgid "This action is not available under your subscription plan."
msgstr ""
-#: ../../addon/pumpio/pumpio.php:148
-msgid "You are now authenticated to pumpio."
+#: ../../include/text.php:478
+msgid "prev"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:149
-msgid "return to the featured settings page"
+#: ../../include/text.php:480
+msgid "first"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:163
-msgid "Post to Pump.io"
+#: ../../include/text.php:509
+msgid "last"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:198
-msgid "Pump.io servername"
+#: ../../include/text.php:512
+msgid "next"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:198
-msgid "Without \"http://\" or \"https://\""
+#: ../../include/text.php:523
+msgid "older"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:202
-msgid "Pump.io username"
+#: ../../include/text.php:525
+msgid "newer"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:202
-msgid "Without the servername"
+#: ../../include/text.php:945
+msgid "No connections"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:213
-msgid "You are not authenticated to pumpio"
+#: ../../include/text.php:970
+#, php-format
+msgid "View all %s connections"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:215
-msgid "(Re-)Authenticate your pump.io connection"
+#: ../../include/text.php:1115 ../../include/text.php:1120
+msgid "poke"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:219
-msgid "Enable pump.io Post Plugin"
+#: ../../include/text.php:1115 ../../include/text.php:1120
+#: ../../include/conversation.php:239
+msgid "poked"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:223
-msgid "Post to pump.io by default"
+#: ../../include/text.php:1121
+msgid "ping"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:227
-msgid "Should posts be public"
+#: ../../include/text.php:1121
+msgid "pinged"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:231
-msgid "Mirror all public posts"
+#: ../../include/text.php:1122
+msgid "prod"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:237
-msgid "Pump.io Post Settings"
+#: ../../include/text.php:1122
+msgid "prodded"
msgstr ""
-#: ../../addon/pumpio/pumpio.php:266
-msgid "PumpIO Settings saved."
+#: ../../include/text.php:1123
+msgid "slap"
msgstr ""
-#: ../../addon/ldapauth/ldapauth.php:61
-msgid "An account has been created for you."
+#: ../../include/text.php:1123
+msgid "slapped"
msgstr ""
-#: ../../addon/ldapauth/ldapauth.php:68
-msgid "Authentication successful but rejected: account creation is disabled."
+#: ../../include/text.php:1124
+msgid "finger"
msgstr ""
-#: ../../addon/opensearch/opensearch.php:43
-msgid "Search $Projectname"
+#: ../../include/text.php:1124
+msgid "fingered"
msgstr ""
-#: ../../addon/redfiles/redfiles.php:119
-msgid "Redmatrix File Storage Import"
+#: ../../include/text.php:1125
+msgid "rebuff"
msgstr ""
-#: ../../addon/redfiles/redfiles.php:120
-msgid "This will import all your Redmatrix cloud files to this channel."
+#: ../../include/text.php:1125
+msgid "rebuffed"
msgstr ""
+<<<<<<< HEAD
+#: ../../include/text.php:1137
+msgid "happy"
+=======
#: ../../addon/redfiles/redfilehelper.php:64
msgid "file"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../addon/hubwall/hubwall.php:19
-msgid "Send email to all members"
+#: ../../include/text.php:1138
+msgid "sad"
msgstr ""
-#: ../../addon/hubwall/hubwall.php:33
-#, php-format
-msgid "$1%s Administrator"
+#: ../../include/text.php:1139
+msgid "mellow"
msgstr ""
-#: ../../addon/hubwall/hubwall.php:73
-#, php-format
-msgid "%1$d of %2$d messages sent."
+#: ../../include/text.php:1140
+msgid "tired"
msgstr ""
-#: ../../addon/hubwall/hubwall.php:81
-msgid "Send email to all hub members."
+#: ../../include/text.php:1141
+msgid "perky"
msgstr ""
-#: ../../addon/hubwall/hubwall.php:93
-msgid "Sender Email address"
+#: ../../include/text.php:1142
+msgid "angry"
msgstr ""
-#: ../../addon/hubwall/hubwall.php:94
-msgid "Test mode (only send to hub administrator)"
+#: ../../include/text.php:1143
+msgid "stupefied"
msgstr ""
-#: ../../include/selectors.php:30
-msgid "Frequently"
+#: ../../include/text.php:1144
+msgid "puzzled"
msgstr ""
-#: ../../include/selectors.php:31
-msgid "Hourly"
+#: ../../include/text.php:1145
+msgid "interested"
msgstr ""
-#: ../../include/selectors.php:32
-msgid "Twice daily"
+#: ../../include/text.php:1146
+msgid "bitter"
msgstr ""
-#: ../../include/selectors.php:33
-msgid "Daily"
+#: ../../include/text.php:1147
+msgid "cheerful"
msgstr ""
-#: ../../include/selectors.php:34
-msgid "Weekly"
+#: ../../include/text.php:1148
+msgid "alive"
msgstr ""
-#: ../../include/selectors.php:35
-msgid "Monthly"
+#: ../../include/text.php:1149
+msgid "annoyed"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Currently Male"
+#: ../../include/text.php:1150
+msgid "anxious"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Currently Female"
+#: ../../include/text.php:1151
+msgid "cranky"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Mostly Male"
+#: ../../include/text.php:1152
+msgid "disturbed"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Mostly Female"
+#: ../../include/text.php:1153
+msgid "frustrated"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Transgender"
+#: ../../include/text.php:1154
+msgid "depressed"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Intersex"
+#: ../../include/text.php:1155
+msgid "motivated"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Transsexual"
+#: ../../include/text.php:1156
+msgid "relaxed"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Hermaphrodite"
+#: ../../include/text.php:1157
+msgid "surprised"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Neuter"
+#: ../../include/text.php:1328 ../../include/js_strings.php:70
+msgid "Monday"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Non-specific"
+#: ../../include/text.php:1328 ../../include/js_strings.php:71
+msgid "Tuesday"
msgstr ""
-#: ../../include/selectors.php:49
-msgid "Undecided"
+#: ../../include/text.php:1328 ../../include/js_strings.php:72
+msgid "Wednesday"
msgstr ""
-#: ../../include/selectors.php:85 ../../include/selectors.php:104
-msgid "Males"
+#: ../../include/text.php:1328 ../../include/js_strings.php:73
+msgid "Thursday"
msgstr ""
-#: ../../include/selectors.php:85 ../../include/selectors.php:104
-msgid "Females"
+#: ../../include/text.php:1328 ../../include/js_strings.php:74
+msgid "Friday"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Gay"
+#: ../../include/text.php:1328 ../../include/js_strings.php:75
+msgid "Saturday"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Lesbian"
+#: ../../include/text.php:1328 ../../include/js_strings.php:69
+msgid "Sunday"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "No Preference"
+#: ../../include/text.php:1332 ../../include/js_strings.php:45
+msgid "January"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Bisexual"
+#: ../../include/text.php:1332 ../../include/js_strings.php:46
+msgid "February"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Autosexual"
+#: ../../include/text.php:1332 ../../include/js_strings.php:47
+msgid "March"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Abstinent"
+#: ../../include/text.php:1332 ../../include/js_strings.php:48
+msgid "April"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Virgin"
+#: ../../include/text.php:1332
+msgid "May"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Deviant"
+#: ../../include/text.php:1332 ../../include/js_strings.php:50
+msgid "June"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Fetish"
+#: ../../include/text.php:1332 ../../include/js_strings.php:51
+msgid "July"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Oodles"
+#: ../../include/text.php:1332 ../../include/js_strings.php:52
+msgid "August"
msgstr ""
-#: ../../include/selectors.php:85
-msgid "Nonsexual"
+#: ../../include/text.php:1332 ../../include/js_strings.php:53
+msgid "September"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Single"
+#: ../../include/text.php:1332 ../../include/js_strings.php:54
+msgid "October"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Lonely"
+#: ../../include/text.php:1332 ../../include/js_strings.php:55
+msgid "November"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Available"
+#: ../../include/text.php:1332 ../../include/js_strings.php:56
+msgid "December"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Unavailable"
+#: ../../include/text.php:1409 ../../include/text.php:1413
+msgid "Unknown Attachment"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Has crush"
+#: ../../include/text.php:1415
+msgid "unknown"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Infatuated"
+#: ../../include/text.php:1451
+msgid "remove category"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Dating"
+#: ../../include/text.php:1525
+msgid "remove from file"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Unfaithful"
+#: ../../include/text.php:1795
+msgid "Page layout"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Sex Addict"
+#: ../../include/text.php:1795
+msgid "You can create your own with the layouts tool"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Friends/Benefits"
+#: ../../include/text.php:1823
+msgid "Page content type"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Casual"
+#: ../../include/text.php:1956
+msgid "activity"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Engaged"
+#: ../../include/text.php:2019
+msgid "a-z, 0-9, -, _, and . only"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Married"
+#: ../../include/text.php:2291
+msgid "Design Tools"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Imaginarily married"
+#: ../../include/text.php:2297
+msgid "Pages"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Partners"
+#: ../../include/text.php:2319
+msgid "Import website..."
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Cohabiting"
+#: ../../include/text.php:2320
+msgid "Select folder to import"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Common law"
+#: ../../include/text.php:2321
+msgid "Import from a zipped folder:"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Happy"
+#: ../../include/text.php:2322
+msgid "Import from cloud files:"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Not looking"
+#: ../../include/text.php:2323
+msgid "/cloud/channel/path/to/folder"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Swinger"
+#: ../../include/text.php:2324
+msgid "Enter path to website files"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Betrayed"
+#: ../../include/text.php:2325
+msgid "Select folder"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Separated"
+#: ../../include/text.php:2326
+msgid "Export website..."
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Unstable"
+#: ../../include/text.php:2327
+msgid "Export to a zip file"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Divorced"
+#: ../../include/text.php:2328
+msgid "website.zip"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Imaginarily divorced"
+#: ../../include/text.php:2329
+msgid "Enter a name for the zip file."
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Widowed"
+#: ../../include/text.php:2330
+msgid "Export to cloud files"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Uncertain"
+#: ../../include/text.php:2331
+msgid "/path/to/export/folder"
msgstr ""
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "It's complicated"
+#: ../../include/text.php:2332
+msgid "Enter a path to a cloud files destination."
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Don't care"
+#: ../../include/text.php:2333
+msgid "Specify folder"
msgstr ""
-#: ../../include/selectors.php:123
-msgid "Ask me"
+#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
+msgid "Tags"
msgstr ""
-#: ../../include/conversation.php:200
-#, php-format
-msgid "%1$s is now connected with %2$s"
+#: ../../include/taxonomy.php:293
+msgid "Keywords"
msgstr ""
-#: ../../include/conversation.php:235
-#, php-format
-msgid "%1$s poked %2$s"
+#: ../../include/taxonomy.php:314
+msgid "have"
msgstr ""
-#: ../../include/conversation.php:239 ../../include/text.php:1115
-#: ../../include/text.php:1120
-msgid "poked"
+#: ../../include/taxonomy.php:314
+msgid "has"
msgstr ""
-#: ../../include/conversation.php:689
-#, php-format
-msgid "View %s's profile @ %s"
+#: ../../include/taxonomy.php:315
+msgid "want"
msgstr ""
-#: ../../include/conversation.php:709
-msgid "Categories:"
+#: ../../include/taxonomy.php:315
+msgid "wants"
msgstr ""
-#: ../../include/conversation.php:710
-msgid "Filed under:"
+#: ../../include/taxonomy.php:316
+msgid "likes"
msgstr ""
-#: ../../include/conversation.php:735
-msgid "View in context"
+#: ../../include/taxonomy.php:317
+msgid "dislikes"
msgstr ""
-#: ../../include/conversation.php:832
-msgid "remove"
+#: ../../include/connections.php:127
+msgid "New window"
+msgstr ""
+
+#: ../../include/connections.php:128
+msgid "Open the selected location in a different window or browser tab"
msgstr ""
-#: ../../include/conversation.php:836 ../../include/nav.php:262
+<<<<<<< HEAD
+#: ../../include/zot.php:646
+msgid "Invalid data packet"
+=======
+#: ../../include/conversation.php:838 ../../include/nav.php:272
msgid "Loading..."
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../include/conversation.php:837
-msgid "Delete Selected Items"
+#: ../../include/zot.php:662
+msgid "Unable to verify channel signature"
msgstr ""
-#: ../../include/conversation.php:880
-msgid "View Source"
+#: ../../include/zot.php:2313
+#, php-format
+msgid "Unable to verify site signature for %s"
msgstr ""
-#: ../../include/conversation.php:890
-msgid "Follow Thread"
+#: ../../include/zot.php:3762
+msgid "invalid target signature"
msgstr ""
-#: ../../include/conversation.php:899
-msgid "Unfollow Thread"
+#: ../../include/datetime.php:147
+msgid "Birthday"
msgstr ""
-#: ../../include/conversation.php:990
-msgid "Activity/Posts"
+#: ../../include/datetime.php:149
+msgid "Age: "
msgstr ""
-#: ../../include/conversation.php:1010
-msgid "Edit Connection"
+#: ../../include/datetime.php:151
+msgid "YYYY-MM-DD or MM-DD"
msgstr ""
-#: ../../include/conversation.php:1020
-msgid "Message"
+#: ../../include/datetime.php:286 ../../boot.php:2419
+msgid "never"
msgstr ""
-#: ../../include/conversation.php:1154
-#, php-format
-msgid "%s likes this."
+#: ../../include/datetime.php:292
+msgid "less than a second ago"
msgstr ""
-#: ../../include/conversation.php:1154
+#: ../../include/datetime.php:310
#, php-format
-msgid "%s doesn't like this."
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
msgstr ""
-#: ../../include/conversation.php:1158
-#, php-format
-msgid "<span %1$s>%2$d people</span> like this."
-msgid_plural "<span %1$s>%2$d people</span> like this."
+#: ../../include/datetime.php:321
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1160
-#, 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."
+#: ../../include/datetime.php:324
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1166
-msgid "and"
-msgstr ""
+#: ../../include/datetime.php:327
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+msgstr[1] ""
-#: ../../include/conversation.php:1169
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
+#: ../../include/datetime.php:330
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1170
+#: ../../include/datetime.php:333
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:336
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:339
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:576
#, php-format
-msgid "%s like this."
+msgid "%1$s's birthday"
msgstr ""
-#: ../../include/conversation.php:1170
+#: ../../include/datetime.php:577
#, php-format
-msgid "%s don't like this."
+msgid "Happy Birthday %1$s"
msgstr ""
-#: ../../include/conversation.php:1213
-msgid "Set your location"
+#: ../../include/selectors.php:30
+msgid "Frequently"
msgstr ""
-#: ../../include/conversation.php:1214
-msgid "Clear browser location"
+#: ../../include/selectors.php:31
+msgid "Hourly"
msgstr ""
-#: ../../include/conversation.php:1262
-msgid "Tag term:"
+#: ../../include/selectors.php:32
+msgid "Twice daily"
msgstr ""
-#: ../../include/conversation.php:1263
-msgid "Where are you right now?"
+#: ../../include/selectors.php:33
+msgid "Daily"
msgstr ""
-#: ../../include/conversation.php:1268
-msgid "Choose a different album..."
+#: ../../include/selectors.php:34
+msgid "Weekly"
msgstr ""
-#: ../../include/conversation.php:1272
-msgid "Comments enabled"
+#: ../../include/selectors.php:35
+msgid "Monthly"
msgstr ""
-#: ../../include/conversation.php:1273
-msgid "Comments disabled"
+#: ../../include/selectors.php:49
+msgid "Currently Male"
msgstr ""
-#: ../../include/conversation.php:1311
-msgid "Page link name"
+<<<<<<< HEAD
+#: ../../include/selectors.php:49
+msgid "Currently Female"
msgstr ""
-#: ../../include/conversation.php:1314
-msgid "Post as"
+#: ../../include/selectors.php:49
+msgid "Mostly Male"
msgstr ""
-#: ../../include/conversation.php:1328
-msgid "Toggle voting"
+#: ../../include/selectors.php:49
+msgid "Mostly Female"
msgstr ""
-#: ../../include/conversation.php:1331
-msgid "Disable comments"
+#: ../../include/selectors.php:49
+msgid "Transgender"
msgstr ""
-#: ../../include/conversation.php:1332
-msgid "Toggle comments"
+#: ../../include/selectors.php:49
+msgid "Intersex"
msgstr ""
-#: ../../include/conversation.php:1340
-msgid "Categories (optional, comma-separated list)"
+#: ../../include/selectors.php:49
+msgid "Transsexual"
msgstr ""
-#: ../../include/conversation.php:1363
-msgid "Other networks and post services"
+#: ../../include/selectors.php:49
+msgid "Hermaphrodite"
msgstr ""
-#: ../../include/conversation.php:1369
-msgid "Set publish date"
+#: ../../include/selectors.php:49
+msgid "Neuter"
+msgstr ""
+
+#: ../../include/selectors.php:49
+msgid "Non-specific"
+msgstr ""
+
+#: ../../include/selectors.php:49
+msgid "Undecided"
+msgstr ""
+
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Males"
+msgstr ""
+
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Females"
+msgstr ""
+
+#: ../../include/selectors.php:85
+msgid "Gay"
+msgstr ""
+
+#: ../../include/selectors.php:85
+msgid "Lesbian"
+msgstr ""
+
+#: ../../include/selectors.php:85
+msgid "No Preference"
+msgstr ""
+
+#: ../../include/selectors.php:85
+msgid "Bisexual"
+msgstr ""
+
+#: ../../include/selectors.php:85
+msgid "Autosexual"
+msgstr ""
+
+#: ../../include/selectors.php:85
+msgid "Abstinent"
+msgstr ""
+
+#: ../../include/selectors.php:85
+msgid "Virgin"
+msgstr ""
+
+#: ../../include/selectors.php:85
+msgid "Deviant"
+msgstr ""
+
+#: ../../include/selectors.php:85
+msgid "Fetish"
+msgstr ""
+
+#: ../../include/selectors.php:85
+msgid "Oodles"
+msgstr ""
+
+#: ../../include/selectors.php:85
+msgid "Nonsexual"
+msgstr ""
+
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Single"
msgstr ""
-#: ../../include/conversation.php:1632
+#: ../../include/selectors.php:123
+msgid "Lonely"
+msgstr ""
+=======
+#: ../../include/conversation.php:1634
msgid "Discover"
msgstr ""
-#: ../../include/conversation.php:1635
+#: ../../include/conversation.php:1637
msgid "Imported public streams"
msgstr ""
-#: ../../include/conversation.php:1640
+#: ../../include/conversation.php:1642
msgid "Commented Order"
msgstr ""
-#: ../../include/conversation.php:1643
+#: ../../include/conversation.php:1645
msgid "Sort by Comment Date"
msgstr ""
-#: ../../include/conversation.php:1647
+#: ../../include/conversation.php:1649
msgid "Posted Order"
msgstr ""
-#: ../../include/conversation.php:1650
+#: ../../include/conversation.php:1652
msgid "Sort by Post Date"
msgstr ""
-#: ../../include/conversation.php:1658
+#: ../../include/conversation.php:1660
msgid "Posts that mention or involve you"
msgstr ""
-#: ../../include/conversation.php:1667
+#: ../../include/conversation.php:1669
msgid "Activity Stream - by date"
msgstr ""
-#: ../../include/conversation.php:1673
+#: ../../include/conversation.php:1675
msgid "Starred"
msgstr ""
-#: ../../include/conversation.php:1676
+#: ../../include/conversation.php:1678
msgid "Favourite Posts"
msgstr ""
-#: ../../include/conversation.php:1683
+#: ../../include/conversation.php:1685
msgid "Spam"
msgstr ""
-#: ../../include/conversation.php:1686
+#: ../../include/conversation.php:1688
msgid "Posts flagged as SPAM"
msgstr ""
-#: ../../include/conversation.php:1761 ../../include/nav.php:365
+#: ../../include/conversation.php:1763 ../../include/nav.php:372
msgid "Status Messages and Posts"
msgstr ""
-#: ../../include/conversation.php:1774 ../../include/nav.php:378
+#: ../../include/conversation.php:1776 ../../include/nav.php:385
msgid "Profile Details"
msgstr ""
-#: ../../include/conversation.php:1784 ../../include/nav.php:388
+#: ../../include/conversation.php:1786 ../../include/nav.php:395
#: ../../include/photos.php:528
msgid "Photo Albums"
msgstr ""
-#: ../../include/conversation.php:1792 ../../include/nav.php:396
+#: ../../include/conversation.php:1794 ../../include/nav.php:403
msgid "Files and Storage"
msgstr ""
-#: ../../include/conversation.php:1828 ../../include/nav.php:431
+#: ../../include/conversation.php:1830 ../../include/nav.php:438
msgid "Bookmarks"
msgstr ""
-#: ../../include/conversation.php:1831 ../../include/nav.php:434
+#: ../../include/conversation.php:1833 ../../include/nav.php:441
msgid "Saved Bookmarks"
msgstr ""
-#: ../../include/conversation.php:1842 ../../include/nav.php:445
+#: ../../include/conversation.php:1844 ../../include/nav.php:452
msgid "View Webpages"
msgstr ""
-#: ../../include/conversation.php:1911
+#: ../../include/conversation.php:1913
msgctxt "noun"
msgid "Attending"
msgid_plural "Attending"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1914
+#: ../../include/conversation.php:1916
msgctxt "noun"
msgid "Not Attending"
msgid_plural "Not Attending"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1917
+#: ../../include/conversation.php:1919
msgctxt "noun"
msgid "Undecided"
msgid_plural "Undecided"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1920
+#: ../../include/conversation.php:1922
msgctxt "noun"
msgid "Agree"
msgid_plural "Agrees"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1923
+#: ../../include/conversation.php:1925
msgctxt "noun"
msgid "Disagree"
msgid_plural "Disagrees"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1926
+#: ../../include/conversation.php:1928
msgctxt "noun"
msgid "Abstain"
msgid_plural "Abstains"
msgstr[0] ""
msgstr[1] ""
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
-#: ../../include/permissions.php:35
-msgid "Can view my normal stream and posts"
+#: ../../include/selectors.php:123
+msgid "Available"
+msgstr ""
+
+#: ../../include/selectors.php:123
+msgid "Unavailable"
msgstr ""
-#: ../../include/permissions.php:39
-msgid "Can view my webpages"
+#: ../../include/selectors.php:123
+msgid "Has crush"
+msgstr ""
+
+#: ../../include/selectors.php:123
+msgid "Infatuated"
+msgstr ""
+
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Dating"
+msgstr ""
+
+#: ../../include/selectors.php:123
+msgid "Unfaithful"
msgstr ""
-#: ../../include/permissions.php:43
-msgid "Can post on my channel page (\"wall\")"
+#: ../../include/selectors.php:123
+msgid "Sex Addict"
msgstr ""
-#: ../../include/permissions.php:46
-msgid "Can like/dislike stuff"
+#: ../../include/selectors.php:123
+msgid "Friends/Benefits"
msgstr ""
-#: ../../include/permissions.php:46
-msgid "Profiles and things other than posts/comments"
+#: ../../include/selectors.php:123
+msgid "Casual"
msgstr ""
-#: ../../include/permissions.php:48
-msgid "Can forward to all my channel contacts via post @mentions"
+#: ../../include/selectors.php:123
+msgid "Engaged"
msgstr ""
-#: ../../include/permissions.php:48
-msgid "Advanced - useful for creating group forum channels"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Married"
msgstr ""
-#: ../../include/permissions.php:49
-msgid "Can chat with me (when available)"
+#: ../../include/selectors.php:123
+msgid "Imaginarily married"
msgstr ""
-#: ../../include/permissions.php:50
-msgid "Can write to my file storage and photos"
+#: ../../include/selectors.php:123
+msgid "Partners"
msgstr ""
-#: ../../include/permissions.php:51
-msgid "Can edit my webpages"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Cohabiting"
msgstr ""
-#: ../../include/permissions.php:53
-msgid "Somewhat advanced - very useful in open communities"
+#: ../../include/selectors.php:123
+msgid "Common law"
msgstr ""
-#: ../../include/permissions.php:55
-msgid "Can administer my channel resources"
+#: ../../include/selectors.php:123
+msgid "Happy"
msgstr ""
-#: ../../include/permissions.php:55
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+#: ../../include/selectors.php:123
+msgid "Not looking"
msgstr ""
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
+#: ../../include/selectors.php:123
+msgid "Swinger"
msgstr ""
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
+#: ../../include/selectors.php:123
+msgid "Betrayed"
msgstr ""
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Separated"
msgstr ""
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
+#: ../../include/selectors.php:123
+msgid "Unstable"
+msgstr ""
+
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Divorced"
+msgstr ""
+
+#: ../../include/selectors.php:123
+msgid "Imaginarily divorced"
+msgstr ""
+
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Widowed"
+msgstr ""
+
+#: ../../include/selectors.php:123
+msgid "Uncertain"
+msgstr ""
+
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "It's complicated"
+msgstr ""
+
+#: ../../include/selectors.php:123
+msgid "Don't care"
+msgstr ""
+
+#: ../../include/selectors.php:123
+msgid "Ask me"
+msgstr ""
+
+#: ../../include/auth.php:148
+msgid "Logged out."
+msgstr ""
+
+#: ../../include/auth.php:275
+msgid "Failed authentication"
msgstr ""
#: ../../include/bookmarks.php:34
@@ -11424,455 +13249,592 @@ msgstr ""
msgid "%1$s's bookmarks"
msgstr ""
-#: ../../include/import.php:41
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
+#: ../../include/attach.php:250 ../../include/attach.php:339
+msgid "Item was not found."
msgstr ""
-#: ../../include/import.php:105
-msgid "Cloned channel not found. Import failed."
+#: ../../include/attach.php:500
+msgid "No source file."
msgstr ""
-#: ../../include/text.php:478
-msgid "prev"
+#: ../../include/attach.php:522
+msgid "Cannot locate file to replace"
msgstr ""
-#: ../../include/text.php:480
-msgid "first"
+#: ../../include/attach.php:540
+msgid "Cannot locate file to revise/update"
msgstr ""
-#: ../../include/text.php:509
-msgid "last"
+#: ../../include/attach.php:671
+#, php-format
+msgid "File exceeds size limit of %d"
msgstr ""
-#: ../../include/text.php:512
-msgid "next"
+#: ../../include/attach.php:685
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
msgstr ""
-#: ../../include/text.php:523
-msgid "older"
+#: ../../include/attach.php:855
+msgid "File upload failed. Possible system limit or action terminated."
msgstr ""
-#: ../../include/text.php:525
-msgid "newer"
+#: ../../include/attach.php:868
+msgid "Stored file could not be verified. Upload failed."
msgstr ""
-#: ../../include/text.php:945
-msgid "No connections"
+#: ../../include/attach.php:923 ../../include/attach.php:939
+msgid "Path not available."
msgstr ""
-#: ../../include/text.php:970
+#: ../../include/attach.php:988 ../../include/attach.php:1153
+msgid "Empty pathname"
+msgstr ""
+
+#: ../../include/attach.php:1014
+msgid "duplicate filename or path"
+msgstr ""
+
+#: ../../include/attach.php:1039
+msgid "Path not found."
+msgstr ""
+
+#: ../../include/attach.php:1107
+msgid "mkdir failed."
+msgstr ""
+
+#: ../../include/attach.php:1111
+msgid "database storage failed."
+msgstr ""
+
+#: ../../include/attach.php:1159
+msgid "Empty path"
+msgstr ""
+
+#: ../../include/page_widgets.php:7
+msgid "New Page"
+msgstr ""
+
+#: ../../include/contact_widgets.php:11
#, php-format
-msgid "View all %s connections"
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
msgstr ""
-#: ../../include/text.php:1115 ../../include/text.php:1120
-msgid "poke"
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
msgstr ""
-#: ../../include/text.php:1121
-msgid "ping"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
msgstr ""
-#: ../../include/text.php:1121
-msgid "pinged"
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
msgstr ""
-#: ../../include/text.php:1122
-msgid "prod"
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
msgstr ""
-#: ../../include/text.php:1122
-msgid "prodded"
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
msgstr ""
-#: ../../include/text.php:1123
-msgid "slap"
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
msgstr ""
-#: ../../include/text.php:1123
-msgid "slapped"
+#: ../../include/contact_widgets.php:122
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:127
+msgid "show more"
msgstr ""
-#: ../../include/text.php:1124
-msgid "finger"
+#: ../../include/nav.php:88
+msgid "Remote authentication"
msgstr ""
-#: ../../include/text.php:1124
-msgid "fingered"
+#: ../../include/nav.php:88
+msgid "Click to authenticate to your home hub"
msgstr ""
-#: ../../include/text.php:1125
-msgid "rebuff"
+#: ../../include/nav.php:99 ../../include/nav.php:123 ../../boot.php:1590
+msgid "Logout"
msgstr ""
-#: ../../include/text.php:1125
-msgid "rebuffed"
+#: ../../include/nav.php:99 ../../include/nav.php:123
+msgid "End this session"
msgstr ""
-#: ../../include/text.php:1137
-msgid "happy"
+#: ../../include/nav.php:102
+msgid "Your profile page"
msgstr ""
-#: ../../include/text.php:1138
-msgid "sad"
+<<<<<<< HEAD
+#: ../../include/nav.php:105
+msgid "Manage/Edit profiles"
msgstr ""
-#: ../../include/text.php:1139
-msgid "mellow"
+#: ../../include/nav.php:107
+msgid "Edit your profile"
msgstr ""
-#: ../../include/text.php:1140
-msgid "tired"
+#: ../../include/nav.php:113
+msgid "Sign in"
msgstr ""
-#: ../../include/text.php:1141
-msgid "perky"
+#: ../../include/nav.php:138
+msgid "Take me home"
msgstr ""
-#: ../../include/text.php:1142
-msgid "angry"
+#: ../../include/nav.php:140
+msgid "Log me out of this site"
msgstr ""
-#: ../../include/text.php:1143
-msgid "stupefied"
+#: ../../include/nav.php:145
+msgid "Create an account"
msgstr ""
-#: ../../include/text.php:1144
-msgid "puzzled"
+#: ../../include/nav.php:157
+msgid "Help and documentation"
msgstr ""
-#: ../../include/text.php:1145
-msgid "interested"
+#: ../../include/nav.php:160
+msgid "Search site @name, #tag, ?docs, content"
msgstr ""
-#: ../../include/text.php:1146
-msgid "bitter"
+#: ../../include/nav.php:172
+msgid "Grid"
msgstr ""
-#: ../../include/text.php:1147
-msgid "cheerful"
+#: ../../include/nav.php:172
+msgid "Your grid"
msgstr ""
-#: ../../include/text.php:1148
-msgid "alive"
+#: ../../include/nav.php:173
+msgid "View your network/grid"
msgstr ""
-#: ../../include/text.php:1149
-msgid "annoyed"
+#: ../../include/nav.php:174
+msgid "Mark all grid notifications seen"
msgstr ""
-#: ../../include/text.php:1150
-msgid "anxious"
+#: ../../include/nav.php:176
+msgid "Channel home"
msgstr ""
-#: ../../include/text.php:1151
-msgid "cranky"
+#: ../../include/nav.php:177
+msgid "View your channel home"
msgstr ""
-#: ../../include/text.php:1152
-msgid "disturbed"
+#: ../../include/nav.php:178
+msgid "Mark all channel notifications seen"
msgstr ""
-#: ../../include/text.php:1153
-msgid "frustrated"
+#: ../../include/nav.php:184
+msgid "Notices"
msgstr ""
-#: ../../include/text.php:1154
-msgid "depressed"
+#: ../../include/nav.php:184
+msgid "Notifications"
msgstr ""
-#: ../../include/text.php:1155
-msgid "motivated"
+#: ../../include/nav.php:185
+msgid "View all notifications"
msgstr ""
-#: ../../include/text.php:1156
-msgid "relaxed"
+#: ../../include/nav.php:188
+msgid "Private mail"
msgstr ""
-#: ../../include/text.php:1157
-msgid "surprised"
+#: ../../include/nav.php:189
+msgid "View your private messages"
+msgstr ""
+
+#: ../../include/nav.php:190
+msgid "Mark all private messages seen"
+msgstr ""
+
+#: ../../include/nav.php:196
+msgid "Event Calendar"
msgstr ""
-#: ../../include/text.php:1333 ../../include/js_strings.php:70
+#: ../../include/nav.php:197
+msgid "View events"
+msgstr ""
+
+#: ../../include/nav.php:198
+msgid "Mark all events seen"
+msgstr ""
+
+#: ../../include/nav.php:201
+msgid "Manage Your Channels"
+msgstr ""
+
+#: ../../include/nav.php:203
+msgid "Account/Channel Settings"
+msgstr ""
+
+#: ../../include/nav.php:211
+msgid "Site Setup and Configuration"
+msgstr ""
+
+#: ../../include/nav.php:268 ../../include/conversation.php:838
+msgid "Loading..."
+msgstr ""
+
+#: ../../include/nav.php:273
+msgid "@name, #tag, ?doc, content"
+msgstr ""
+
+#: ../../include/nav.php:274
+msgid "Please wait..."
+msgstr ""
+
+#: ../../include/nav.php:276
+msgid "Add Apps"
+msgstr ""
+
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
+msgstr ""
+
+#: ../../include/channel.php:67
+msgid "Empty name"
+msgstr ""
+
+#: ../../include/channel.php:70
+msgid "Name too long"
+msgstr ""
+
+#: ../../include/channel.php:181
+msgid "No account identifier"
+msgstr ""
+
+#: ../../include/channel.php:193
+msgid "Nickname is required."
+msgstr ""
+
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr ""
+
+#: ../../include/channel.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr ""
+
+#: ../../include/channel.php:271
+msgid "Unable to retrieve created identity"
+msgstr ""
+
+#: ../../include/channel.php:343
+msgid "Default Profile"
+msgstr ""
+
+#: ../../include/channel.php:1044
+msgid "Create New Profile"
+msgstr ""
+
+#: ../../include/channel.php:1064
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../include/channel.php:1137 ../../include/channel.php:1231
+msgid "Gender:"
+msgstr ""
+
+#: ../../include/channel.php:1139 ../../include/channel.php:1286
+msgid "Homepage:"
+msgstr ""
+
+#: ../../include/channel.php:1140
+msgid "Online Now"
+=======
+#: ../../include/text.php:1335 ../../include/js_strings.php:70
msgid "Monday"
msgstr ""
-#: ../../include/text.php:1333 ../../include/js_strings.php:71
+#: ../../include/text.php:1335 ../../include/js_strings.php:71
msgid "Tuesday"
msgstr ""
-#: ../../include/text.php:1333 ../../include/js_strings.php:72
+#: ../../include/text.php:1335 ../../include/js_strings.php:72
msgid "Wednesday"
msgstr ""
-#: ../../include/text.php:1333 ../../include/js_strings.php:73
+#: ../../include/text.php:1335 ../../include/js_strings.php:73
msgid "Thursday"
msgstr ""
-#: ../../include/text.php:1333 ../../include/js_strings.php:74
+#: ../../include/text.php:1335 ../../include/js_strings.php:74
msgid "Friday"
msgstr ""
-#: ../../include/text.php:1333 ../../include/js_strings.php:75
+#: ../../include/text.php:1335 ../../include/js_strings.php:75
msgid "Saturday"
msgstr ""
-#: ../../include/text.php:1333 ../../include/js_strings.php:69
+#: ../../include/text.php:1335 ../../include/js_strings.php:69
msgid "Sunday"
msgstr ""
-#: ../../include/text.php:1337 ../../include/js_strings.php:45
+#: ../../include/text.php:1339 ../../include/js_strings.php:45
msgid "January"
msgstr ""
-#: ../../include/text.php:1337 ../../include/js_strings.php:46
+#: ../../include/text.php:1339 ../../include/js_strings.php:46
msgid "February"
msgstr ""
-#: ../../include/text.php:1337 ../../include/js_strings.php:47
+#: ../../include/text.php:1339 ../../include/js_strings.php:47
msgid "March"
msgstr ""
-#: ../../include/text.php:1337 ../../include/js_strings.php:48
+#: ../../include/text.php:1339 ../../include/js_strings.php:48
msgid "April"
msgstr ""
-#: ../../include/text.php:1337
+#: ../../include/text.php:1339
msgid "May"
msgstr ""
-#: ../../include/text.php:1337 ../../include/js_strings.php:50
+#: ../../include/text.php:1339 ../../include/js_strings.php:50
msgid "June"
msgstr ""
-#: ../../include/text.php:1337 ../../include/js_strings.php:51
+#: ../../include/text.php:1339 ../../include/js_strings.php:51
msgid "July"
msgstr ""
-#: ../../include/text.php:1337 ../../include/js_strings.php:52
+#: ../../include/text.php:1339 ../../include/js_strings.php:52
msgid "August"
msgstr ""
-#: ../../include/text.php:1337 ../../include/js_strings.php:53
+#: ../../include/text.php:1339 ../../include/js_strings.php:53
msgid "September"
msgstr ""
-#: ../../include/text.php:1337 ../../include/js_strings.php:54
+#: ../../include/text.php:1339 ../../include/js_strings.php:54
msgid "October"
msgstr ""
-#: ../../include/text.php:1337 ../../include/js_strings.php:55
+#: ../../include/text.php:1339 ../../include/js_strings.php:55
msgid "November"
msgstr ""
-#: ../../include/text.php:1337 ../../include/js_strings.php:56
+#: ../../include/text.php:1339 ../../include/js_strings.php:56
msgid "December"
msgstr ""
-#: ../../include/text.php:1401 ../../include/text.php:1405
+#: ../../include/text.php:1403 ../../include/text.php:1407
msgid "Unknown Attachment"
msgstr ""
-#: ../../include/text.php:1407 ../../include/feedutils.php:745
+#: ../../include/text.php:1409
msgid "unknown"
msgstr ""
-#: ../../include/text.php:1443
+#: ../../include/text.php:1445
msgid "remove category"
msgstr ""
-#: ../../include/text.php:1517
+#: ../../include/text.php:1519
msgid "remove from file"
msgstr ""
-#: ../../include/text.php:1636 ../../include/message.php:12
-msgid "Download binary/encrypted content"
-msgstr ""
-
-#: ../../include/text.php:1795 ../../include/language.php:367
+#: ../../include/text.php:1781 ../../include/language.php:367
msgid "default"
msgstr ""
-#: ../../include/text.php:1803
+#: ../../include/text.php:1789
msgid "Page layout"
msgstr ""
-#: ../../include/text.php:1803
+#: ../../include/text.php:1789
msgid "You can create your own with the layouts tool"
msgstr ""
-#: ../../include/text.php:1831
+#: ../../include/text.php:1817
msgid "Page content type"
msgstr ""
-#: ../../include/text.php:1964
+#: ../../include/text.php:1950
msgid "activity"
msgstr ""
-#: ../../include/text.php:2277
+#: ../../include/text.php:2264
msgid "Design Tools"
msgstr ""
-#: ../../include/text.php:2283
+#: ../../include/text.php:2270
msgid "Pages"
msgstr ""
-#: ../../include/text.php:2305
+#: ../../include/text.php:2292
msgid "Import website..."
msgstr ""
-#: ../../include/text.php:2306
+#: ../../include/text.php:2293
msgid "Select folder to import"
msgstr ""
-#: ../../include/text.php:2307
+#: ../../include/text.php:2294
msgid "Import from a zipped folder:"
msgstr ""
-#: ../../include/text.php:2308
+#: ../../include/text.php:2295
msgid "Import from cloud files:"
msgstr ""
-#: ../../include/text.php:2309
+#: ../../include/text.php:2296
msgid "/cloud/channel/path/to/folder"
msgstr ""
-#: ../../include/text.php:2310
+#: ../../include/text.php:2297
msgid "Enter path to website files"
msgstr ""
-#: ../../include/text.php:2311
+#: ../../include/text.php:2298
msgid "Select folder"
msgstr ""
-#: ../../include/text.php:2312
+#: ../../include/text.php:2299
msgid "Export website..."
msgstr ""
-#: ../../include/text.php:2313
+#: ../../include/text.php:2300
msgid "Export to a zip file"
msgstr ""
-#: ../../include/text.php:2314
+#: ../../include/text.php:2301
msgid "website.zip"
msgstr ""
-#: ../../include/text.php:2315
+#: ../../include/text.php:2302
msgid "Enter a name for the zip file."
msgstr ""
-#: ../../include/text.php:2316
+#: ../../include/text.php:2303
msgid "Export to cloud files"
msgstr ""
-#: ../../include/text.php:2317
+#: ../../include/text.php:2304
msgid "/path/to/export/folder"
msgstr ""
-#: ../../include/text.php:2318
+#: ../../include/text.php:2305
msgid "Enter a path to a cloud files destination."
msgstr ""
-#: ../../include/text.php:2319
+#: ../../include/text.php:2306
msgid "Specify folder"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../include/contact_widgets.php:11
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/channel.php:1236
+msgid "Like this channel"
+msgstr ""
-#: ../../include/contact_widgets.php:19
-msgid "Find Channels"
+#: ../../include/channel.php:1260
+msgid "j F, Y"
msgstr ""
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
+#: ../../include/channel.php:1261
+msgid "j F"
msgstr ""
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
+#: ../../include/channel.php:1268
+msgid "Birthday:"
msgstr ""
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
+#: ../../include/channel.php:1281
+#, php-format
+msgid "for %1$d %2$s"
msgstr ""
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
+#: ../../include/channel.php:1284
+msgid "Sexual Preference:"
msgstr ""
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
+#: ../../include/channel.php:1290
+msgid "Tags:"
msgstr ""
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
+#: ../../include/channel.php:1292
+msgid "Political Views:"
msgstr ""
-#: ../../include/contact_widgets.php:122
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/channel.php:1294
+msgid "Religion:"
+msgstr ""
-#: ../../include/contact_widgets.php:127
-msgid "show more"
+#: ../../include/channel.php:1298
+msgid "Hobbies/Interests:"
msgstr ""
-#: ../../include/markdown.php:377
-msgid "Attachments:"
+#: ../../include/channel.php:1300
+msgid "Likes:"
msgstr ""
-#: ../../include/markdown.php:474 ../../include/event.php:22
-#: ../../include/event.php:69
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/channel.php:1302
+msgid "Dislikes:"
msgstr ""
-#: ../../include/markdown.php:476
-msgid "$Projectname event notification:"
+#: ../../include/channel.php:1304
+msgid "Contact information and Social Networks:"
msgstr ""
-#: ../../include/markdown.php:480 ../../include/event.php:30
-#: ../../include/event.php:73
-msgid "Starts:"
+#: ../../include/channel.php:1306
+msgid "My other channels:"
msgstr ""
-#: ../../include/markdown.php:488 ../../include/event.php:40
-#: ../../include/event.php:77
-msgid "Finishes:"
+#: ../../include/channel.php:1308
+msgid "Musical interests:"
msgstr ""
-#: ../../include/follow.php:26
-msgid "Channel is blocked on this site."
+#: ../../include/channel.php:1310
+msgid "Books, literature:"
msgstr ""
-#: ../../include/follow.php:31
-msgid "Channel location missing."
+#: ../../include/channel.php:1312
+msgid "Television:"
msgstr ""
-#: ../../include/follow.php:73
-msgid "Response from remote channel was incomplete."
+#: ../../include/channel.php:1314
+msgid "Film/dance/culture/entertainment:"
msgstr ""
-#: ../../include/follow.php:90
-msgid "Channel was deleted and no longer exists."
+#: ../../include/channel.php:1316
+msgid "Love/Romance:"
msgstr ""
-#: ../../include/follow.php:140 ../../include/follow.php:175
-msgid "Protocol disabled."
+#: ../../include/channel.php:1318
+msgid "Work/employment:"
msgstr ""
-#: ../../include/follow.php:163
-msgid "Channel discovery failed."
+#: ../../include/channel.php:1320
+msgid "School/education:"
msgstr ""
-#: ../../include/follow.php:202
-msgid "Cannot connect to yourself."
+#: ../../include/channel.php:1343
+msgid "Like this thing"
+msgstr ""
+
+#: ../../include/channel.php:2114
+#, php-format
+msgid "User '%s' deleted"
msgstr ""
#: ../../include/js_strings.php:5
@@ -12122,365 +14084,649 @@ msgctxt "calendar"
msgid "All day"
msgstr ""
-#: ../../include/message.php:40
+<<<<<<< HEAD
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+=======
+#: ../../include/message.php:30
msgid "Unable to determine sender."
msgstr ""
-#: ../../include/message.php:79
+#: ../../include/message.php:69
msgid "No recipient provided."
msgstr ""
-#: ../../include/message.php:84
+#: ../../include/message.php:74
msgid "[no subject]"
msgstr ""
-#: ../../include/message.php:238
+#: ../../include/message.php:227
msgid "Stored post could not be verified."
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../include/activities.php:41
-msgid " and "
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
msgstr ""
-#: ../../include/activities.php:49
-msgid "public profile"
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
msgstr ""
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+#: ../../include/group.php:26
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
msgstr ""
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
+#: ../../include/group.php:268
+msgid "Add new connections to this privacy group"
msgstr ""
-#: ../../include/activities.php:62
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
+#: ../../include/group.php:309
+msgid "edit"
msgstr ""
-#: ../../include/attach.php:250 ../../include/attach.php:339
-msgid "Item was not found."
+#: ../../include/group.php:331 ../../include/features.php:292
+msgid "Privacy Groups"
msgstr ""
-#: ../../include/attach.php:500
-msgid "No source file."
+#: ../../include/group.php:332
+msgid "Edit group"
msgstr ""
-#: ../../include/attach.php:522
-msgid "Cannot locate file to replace"
+#: ../../include/group.php:333
+msgid "Add privacy group"
msgstr ""
-#: ../../include/attach.php:540
-msgid "Cannot locate file to revise/update"
+#: ../../include/group.php:334
+msgid "Channels not in any privacy group"
msgstr ""
-#: ../../include/attach.php:671
+#: ../../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:1208
+msgid "Not specified"
+msgstr ""
+
+#: ../../include/event.php:1209
+msgid "Needs Action"
+msgstr ""
+
+#: ../../include/event.php:1210
+msgid "Completed"
+msgstr ""
+
+#: ../../include/event.php:1211
+msgid "In Process"
+msgstr ""
+
+#: ../../include/event.php:1212
+msgid "Cancelled"
+msgstr ""
+
+#: ../../include/conversation.php:200
#, php-format
-msgid "File exceeds size limit of %d"
+msgid "%1$s is now connected with %2$s"
msgstr ""
-#: ../../include/attach.php:685
+#: ../../include/conversation.php:235
#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgid "%1$s poked %2$s"
msgstr ""
-#: ../../include/attach.php:855
-msgid "File upload failed. Possible system limit or action terminated."
+#: ../../include/conversation.php:691
+#, php-format
+msgid "View %s's profile @ %s"
msgstr ""
-#: ../../include/attach.php:868
-msgid "Stored file could not be verified. Upload failed."
+#: ../../include/conversation.php:711
+msgid "Categories:"
msgstr ""
-#: ../../include/attach.php:923 ../../include/attach.php:939
-msgid "Path not available."
+<<<<<<< HEAD
+#: ../../include/conversation.php:712
+msgid "Filed under:"
msgstr ""
-#: ../../include/attach.php:988 ../../include/attach.php:1153
-msgid "Empty pathname"
+#: ../../include/conversation.php:737
+msgid "View in context"
msgstr ""
-#: ../../include/attach.php:1014
-msgid "duplicate filename or path"
+#: ../../include/conversation.php:834
+msgid "remove"
msgstr ""
-#: ../../include/attach.php:1039
-msgid "Path not found."
+#: ../../include/conversation.php:839
+msgid "Delete Selected Items"
msgstr ""
-#: ../../include/attach.php:1107
-msgid "mkdir failed."
+#: ../../include/conversation.php:882
+msgid "View Source"
msgstr ""
-#: ../../include/attach.php:1111
-msgid "database storage failed."
+#: ../../include/conversation.php:892
+msgid "Follow Thread"
msgstr ""
-#: ../../include/attach.php:1159
-msgid "Empty path"
+#: ../../include/conversation.php:901
+msgid "Unfollow Thread"
msgstr ""
-#: ../../include/security.php:117
-msgid "guest:"
+#: ../../include/conversation.php:992
+msgid "Activity/Posts"
msgstr ""
-#: ../../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."
+#: ../../include/conversation.php:1012
+msgid "Edit Connection"
+msgstr ""
+
+#: ../../include/conversation.php:1022
+msgid "Message"
msgstr ""
-#: ../../include/items.php:883 ../../include/items.php:930
+#: ../../include/conversation.php:1156
+=======
+#: ../../include/items.php:869 ../../include/items.php:916
msgid "(Unknown)"
msgstr ""
-#: ../../include/items.php:1124
+#: ../../include/items.php:1110
msgid "Visible to anybody on the internet."
msgstr ""
-#: ../../include/items.php:1126
+#: ../../include/items.php:1112
msgid "Visible to you only."
msgstr ""
-#: ../../include/items.php:1128
+#: ../../include/items.php:1114
msgid "Visible to anybody in this network."
msgstr ""
-#: ../../include/items.php:1130
+#: ../../include/items.php:1116
msgid "Visible to anybody authenticated."
msgstr ""
-#: ../../include/items.php:1132
+#: ../../include/items.php:1118
#, php-format
msgid "Visible to anybody on %s."
msgstr ""
-#: ../../include/items.php:1134
+#: ../../include/items.php:1120
msgid "Visible to all connections."
msgstr ""
-#: ../../include/items.php:1136
+#: ../../include/items.php:1122
msgid "Visible to approved connections."
msgstr ""
-#: ../../include/items.php:1138
+#: ../../include/items.php:1124
msgid "Visible to specific connections."
msgstr ""
-#: ../../include/items.php:3963
+#: ../../include/items.php:3938
msgid "Privacy group is empty."
msgstr ""
-#: ../../include/items.php:3970
+#: ../../include/items.php:3945
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
#, php-format
-msgid "Privacy group: %s"
+msgid "%s likes this."
msgstr ""
-#: ../../include/items.php:3982
+<<<<<<< HEAD
+#: ../../include/conversation.php:1156
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1160
+#, 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/items.php:3957
msgid "Connection not found."
msgstr ""
-#: ../../include/items.php:4335
+#: ../../include/items.php:4310
msgid "profile photo"
msgstr ""
-#: ../../include/items.php:4528
+#: ../../include/items.php:4506
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
#, php-format
-msgid "[Edited %s]"
+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] ""
+
+<<<<<<< HEAD
+#: ../../include/conversation.php:1168
+msgid "and"
msgstr ""
-#: ../../include/items.php:4528
+#: ../../include/conversation.php:1171
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+=======
+#: ../../include/items.php:4506
msgctxt "edit_activity"
msgid "Post"
msgstr ""
-#: ../../include/items.php:4528
+#: ../../include/items.php:4506
msgctxt "edit_activity"
msgid "Comment"
msgstr ""
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
-#: ../../include/channel.php:33
-msgid "Unable to obtain identity information from database"
+#: ../../include/conversation.php:1172
+#, php-format
+msgid "%s like this."
msgstr ""
-#: ../../include/channel.php:68
-msgid "Empty name"
+#: ../../include/conversation.php:1172
+#, php-format
+msgid "%s don't like this."
msgstr ""
-#: ../../include/channel.php:71
-msgid "Name too long"
+#: ../../include/conversation.php:1215
+msgid "Set your location"
msgstr ""
-#: ../../include/channel.php:182
-msgid "No account identifier"
+#: ../../include/conversation.php:1216
+msgid "Clear browser location"
msgstr ""
-#: ../../include/channel.php:194
-msgid "Nickname is required."
+#: ../../include/conversation.php:1264
+msgid "Tag term:"
msgstr ""
-#: ../../include/channel.php:208
-msgid "Reserved nickname. Please choose another."
+#: ../../include/conversation.php:1265
+msgid "Where are you right now?"
msgstr ""
-#: ../../include/channel.php:213
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
+#: ../../include/conversation.php:1270
+msgid "Choose a different album..."
msgstr ""
-#: ../../include/channel.php:271
-msgid "Unable to retrieve created identity"
+#: ../../include/conversation.php:1274
+msgid "Comments enabled"
msgstr ""
-#: ../../include/channel.php:343
-msgid "Default Profile"
+#: ../../include/conversation.php:1275
+msgid "Comments disabled"
+msgstr ""
+
+<<<<<<< HEAD
+#: ../../include/conversation.php:1313
+msgid "Page link name"
+msgstr ""
+
+#: ../../include/conversation.php:1316
+msgid "Post as"
+msgstr ""
+
+#: ../../include/conversation.php:1330
+msgid "Toggle voting"
+msgstr ""
+
+#: ../../include/conversation.php:1333
+msgid "Disable comments"
+msgstr ""
+
+#: ../../include/conversation.php:1334
+msgid "Toggle comments"
+msgstr ""
+
+#: ../../include/conversation.php:1342
+msgid "Categories (optional, comma-separated list)"
+msgstr ""
+
+#: ../../include/conversation.php:1365
+msgid "Other networks and post services"
+msgstr ""
+
+#: ../../include/conversation.php:1371
+msgid "Set publish date"
+msgstr ""
+
+#: ../../include/conversation.php:1625
+msgid "Discover"
+msgstr ""
+
+#: ../../include/conversation.php:1628
+msgid "Imported public streams"
+msgstr ""
+
+#: ../../include/conversation.php:1633
+msgid "Commented Order"
+msgstr ""
+
+#: ../../include/conversation.php:1636
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../include/conversation.php:1640
+msgid "Posted Order"
+msgstr ""
+
+#: ../../include/conversation.php:1643
+msgid "Sort by Post Date"
+msgstr ""
+
+#: ../../include/conversation.php:1651
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../include/conversation.php:1660
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../include/conversation.php:1666
+msgid "Starred"
+msgstr ""
+
+#: ../../include/conversation.php:1669
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1676
+msgid "Spam"
+msgstr ""
+
+#: ../../include/conversation.php:1679
+msgid "Posts flagged as SPAM"
+msgstr ""
+
+#: ../../include/conversation.php:1754
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1767
+msgid "Profile Details"
+msgstr ""
+
+#: ../../include/conversation.php:1785
+msgid "Files and Storage"
+msgstr ""
+
+#: ../../include/conversation.php:1821
+msgid "Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1824
+msgid "Saved Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1835
+msgid "View Webpages"
+msgstr ""
+
+#: ../../include/conversation.php:1904
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1907
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1910
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1913
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1916
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1919
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/help.php:33
+msgid "Help:"
msgstr ""
-#: ../../include/channel.php:1059
+#: ../../include/help.php:65
+msgid "Not Found"
+=======
+#: ../../include/channel.php:1045
msgid "Create New Profile"
msgstr ""
-#: ../../include/channel.php:1079
+#: ../../include/channel.php:1065
msgid "Visible to everybody"
msgstr ""
-#: ../../include/channel.php:1152 ../../include/channel.php:1266
+#: ../../include/channel.php:1138 ../../include/channel.php:1252
msgid "Gender:"
msgstr ""
-#: ../../include/channel.php:1154 ../../include/channel.php:1321
+#: ../../include/channel.php:1140 ../../include/channel.php:1307
msgid "Homepage:"
msgstr ""
-#: ../../include/channel.php:1155
+#: ../../include/channel.php:1141
msgid "Online Now"
msgstr ""
-#: ../../include/channel.php:1271
+#: ../../include/channel.php:1257
msgid "Like this channel"
msgstr ""
-#: ../../include/channel.php:1295
+#: ../../include/channel.php:1281
msgid "j F, Y"
msgstr ""
-#: ../../include/channel.php:1296
+#: ../../include/channel.php:1282
msgid "j F"
msgstr ""
-#: ../../include/channel.php:1303
+#: ../../include/channel.php:1289
msgid "Birthday:"
msgstr ""
-#: ../../include/channel.php:1316
+#: ../../include/channel.php:1302
#, php-format
msgid "for %1$d %2$s"
msgstr ""
-#: ../../include/channel.php:1319
+#: ../../include/channel.php:1305
msgid "Sexual Preference:"
msgstr ""
-#: ../../include/channel.php:1325
+#: ../../include/channel.php:1311
msgid "Tags:"
msgstr ""
-#: ../../include/channel.php:1327
+#: ../../include/channel.php:1313
msgid "Political Views:"
msgstr ""
-#: ../../include/channel.php:1329
+#: ../../include/channel.php:1315
msgid "Religion:"
msgstr ""
-#: ../../include/channel.php:1333
+#: ../../include/channel.php:1319
msgid "Hobbies/Interests:"
msgstr ""
-#: ../../include/channel.php:1335
+#: ../../include/channel.php:1321
msgid "Likes:"
msgstr ""
-#: ../../include/channel.php:1337
+#: ../../include/channel.php:1323
msgid "Dislikes:"
msgstr ""
-#: ../../include/channel.php:1339
+#: ../../include/channel.php:1325
msgid "Contact information and Social Networks:"
msgstr ""
-#: ../../include/channel.php:1341
+#: ../../include/channel.php:1327
msgid "My other channels:"
msgstr ""
-#: ../../include/channel.php:1343
+#: ../../include/channel.php:1329
msgid "Musical interests:"
msgstr ""
-#: ../../include/channel.php:1345
+#: ../../include/channel.php:1331
msgid "Books, literature:"
msgstr ""
-#: ../../include/channel.php:1347
+#: ../../include/channel.php:1333
msgid "Television:"
msgstr ""
-#: ../../include/channel.php:1349
+#: ../../include/channel.php:1335
msgid "Film/dance/culture/entertainment:"
msgstr ""
-#: ../../include/channel.php:1351
+#: ../../include/channel.php:1337
msgid "Love/Romance:"
msgstr ""
-#: ../../include/channel.php:1353
+#: ../../include/channel.php:1339
msgid "Work/employment:"
msgstr ""
-#: ../../include/channel.php:1355
+#: ../../include/channel.php:1341
msgid "School/education:"
msgstr ""
-#: ../../include/channel.php:1378
+#: ../../include/channel.php:1364
msgid "Like this thing"
msgstr ""
-#: ../../include/channel.php:2148
+#: ../../include/channel.php:2139
#, php-format
msgid "User '%s' deleted"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../include/event.php:1004
-msgid "This event has been added to your calendar."
+#: ../../include/security.php:117
+msgid "guest:"
msgstr ""
-#: ../../include/event.php:1204
-msgid "Not specified"
+#: ../../include/security.php:532
+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/event.php:1205
-msgid "Needs Action"
+#: ../../include/message.php:30
+msgid "Unable to determine sender."
msgstr ""
-#: ../../include/event.php:1206
-msgid "Completed"
+#: ../../include/message.php:67
+msgid "No recipient provided."
msgstr ""
-#: ../../include/event.php:1207
-msgid "In Process"
+#: ../../include/message.php:72
+msgid "[no subject]"
msgstr ""
-#: ../../include/event.php:1208
-msgid "Cancelled"
+#: ../../include/message.php:223
+msgid "Stored post could not be verified."
msgstr ""
#: ../../include/network.php:776
msgid "view full size"
msgstr ""
+<<<<<<< HEAD
+#: ../../include/network.php:1490
+msgid "No Subject"
+msgstr ""
+
+#: ../../include/network.php:1744 ../../include/network.php:1745
+msgid "Friendica"
+msgstr ""
+
+#: ../../include/network.php:1746
+msgid "OStatus"
+msgstr ""
+
+#: ../../include/network.php:1747
+msgid "GNU-Social"
+msgstr ""
+
+#: ../../include/network.php:1748
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/network.php:1750
+msgid "Diaspora"
+msgstr ""
+
+#: ../../include/network.php:1751
+msgid "Facebook"
+msgstr ""
+
+#: ../../include/network.php:1752
+msgid "Zot"
+msgstr ""
+
+#: ../../include/network.php:1753
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/network.php:1754
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/network.php:1755
+=======
#: ../../include/network.php:2042
msgid "No Subject"
msgstr ""
@@ -12522,17 +14768,10 @@ msgid "XMPP/IM"
msgstr ""
#: ../../include/network.php:2321
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgid "MySpace"
msgstr ""
-#: ../../include/page_widgets.php:7
-msgid "New Page"
-msgstr ""
-
-#: ../../include/language.php:380
-msgid "Select an alternate language"
-msgstr ""
-
#: ../../include/acl_selectors.php:208
msgid "Who can see this?"
msgstr ""
@@ -12562,54 +14801,143 @@ msgid ""
"permissions set who is allowed to view the post."
msgstr ""
-#: ../../include/dba/dba_driver.php:189
+#: ../../include/activities.php:41
+msgid " and "
+msgstr ""
+
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr ""
+
+#: ../../include/activities.php:58
#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
msgstr ""
-#: ../../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
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr ""
+
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr ""
+
+#: ../../include/items.php:842 ../../include/items.php:889
+msgid "(Unknown)"
+msgstr ""
+
+#: ../../include/items.php:1080
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1082
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1084
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1086
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1088
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr ""
+
+#: ../../include/items.php:1090
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1092
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1094
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:3863
+msgid "Privacy group is empty."
+msgstr ""
+
+#: ../../include/items.php:3870
+#, php-format
+msgid "Privacy group: %s"
+msgstr ""
+
+#: ../../include/items.php:3882
+msgid "Connection not found."
+msgstr ""
+
+#: ../../include/items.php:4231
+msgid "profile photo"
+msgstr ""
+
+#: ../../include/items.php:4427
+#, php-format
+msgid "[Edited %s]"
+msgstr ""
+
+#: ../../include/items.php:4427
+msgctxt "edit_activity"
+msgid "Post"
+msgstr ""
+
+#: ../../include/items.php:4427
+msgctxt "edit_activity"
+msgid "Comment"
+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
msgid "Image/photo"
msgstr ""
-#: ../../include/bbcode.php:233 ../../include/bbcode.php:1147
+#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
msgid "Encrypted content"
msgstr ""
-#: ../../include/bbcode.php:249
+#: ../../include/bbcode.php:189
#, php-format
msgid "Install %s element: "
msgstr ""
-#: ../../include/bbcode.php:253
+#: ../../include/bbcode.php:193
#, php-format
msgid ""
"This post contains an installable %s element, however you lack permissions "
"to install it on this site."
msgstr ""
-#: ../../include/bbcode.php:332
+#: ../../include/bbcode.php:272
#, php-format
msgid "%1$s wrote the following %2$s %3$s"
msgstr ""
-#: ../../include/bbcode.php:409 ../../include/bbcode.php:417
+#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
msgid "Click to open/close"
msgstr ""
-#: ../../include/bbcode.php:417
+#: ../../include/bbcode.php:357
msgid "spoiler"
msgstr ""
-#: ../../include/bbcode.php:1085
+#: ../../include/bbcode.php:1028
msgid "$1 wrote:"
msgstr ""
+<<<<<<< HEAD
+=======
#: ../../include/oembed.php:315
msgid " by "
msgstr ""
@@ -12626,6 +14954,7 @@ msgstr ""
msgid "Embedding disabled"
msgstr ""
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
#: ../../include/features.php:58
msgid "General Features"
msgstr ""
@@ -12817,10 +15146,6 @@ msgstr ""
msgid "Ability to select posts by date ranges"
msgstr ""
-#: ../../include/features.php:292 ../../include/group.php:331
-msgid "Privacy Groups"
-msgstr ""
-
#: ../../include/features.php:293
msgid "Enable management and selection of privacy groups"
msgstr ""
@@ -12881,6 +15206,7 @@ msgstr ""
msgid "Post Categories"
msgstr ""
+<<<<<<< HEAD
#: ../../include/features.php:373
msgid "Add categories to your posts"
msgstr ""
@@ -12931,187 +15257,89 @@ msgid ""
"channel"
msgstr ""
-#: ../../include/taxonomy.php:258 ../../include/taxonomy.php:279
-msgid "Tags"
-msgstr ""
-
-#: ../../include/taxonomy.php:323
-msgid "Keywords"
-msgstr ""
-
-#: ../../include/taxonomy.php:344
-msgid "have"
-msgstr ""
-
-#: ../../include/taxonomy.php:344
-msgid "has"
-msgstr ""
-
-#: ../../include/taxonomy.php:345
-msgid "want"
-msgstr ""
-
-#: ../../include/taxonomy.php:345
-msgid "wants"
-msgstr ""
-
-#: ../../include/taxonomy.php:346
-msgid "likes"
-msgstr ""
-
-#: ../../include/taxonomy.php:347
-msgid "dislikes"
-msgstr ""
-
-#: ../../include/account.php:35
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../../include/account.php:37
-msgid "Your email domain is not among those allowed on this site"
-msgstr ""
-
-#: ../../include/account.php:43
-msgid "Your email address is already registered at this site."
-msgstr ""
-
-#: ../../include/account.php:75
-msgid "An invitation is required."
+#: ../../include/follow.php:26
+msgid "Channel is blocked on this site."
msgstr ""
-#: ../../include/account.php:79
-msgid "Invitation could not be verified."
+#: ../../include/follow.php:31
+msgid "Channel location missing."
msgstr ""
-#: ../../include/account.php:130
-msgid "Please enter the required information."
+#: ../../include/follow.php:73
+msgid "Response from remote channel was incomplete."
msgstr ""
-#: ../../include/account.php:198
-msgid "Failed to store account information."
+#: ../../include/follow.php:90
+msgid "Channel was deleted and no longer exists."
msgstr ""
-#: ../../include/account.php:263
-#, php-format
-msgid "Registration confirmation for %s"
+#: ../../include/follow.php:140 ../../include/follow.php:175
+msgid "Protocol disabled."
msgstr ""
-#: ../../include/account.php:330
-#, php-format
-msgid "Registration request at %s"
+#: ../../include/follow.php:163
+msgid "Channel discovery failed."
msgstr ""
-#: ../../include/account.php:352
-msgid "your registration password"
+#: ../../include/follow.php:202
+msgid "Cannot connect to yourself."
msgstr ""
-#: ../../include/account.php:358 ../../include/account.php:420
-#, php-format
-msgid "Registration details for %s"
+#: ../../include/oembed.php:308
+msgid " by "
msgstr ""
-#: ../../include/account.php:431
-msgid "Account approved."
+#: ../../include/oembed.php:309
+msgid " on "
msgstr ""
-#: ../../include/account.php:471
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../include/oembed.php:338
+msgid "Embedded content"
msgstr ""
-#: ../../include/account.php:756 ../../include/account.php:758
-msgid "Click here to upgrade."
+#: ../../include/oembed.php:347
+msgid "Embedding disabled"
msgstr ""
-#: ../../include/account.php:764
-msgid "This action exceeds the limits set by your subscription plan."
+#: ../../util/nconfig.php:34
+msgid "Source channel not found."
msgstr ""
-#: ../../include/account.php:769
-msgid "This action is not available under your subscription plan."
+#: ../../view/theme/redbasic/php/config.php:9
+msgid "Focus (Hubzilla default)"
msgstr ""
-#: ../../include/datetime.php:147
-msgid "Birthday"
+#: ../../view/theme/redbasic/php/config.php:88
+msgid "Theme settings"
msgstr ""
-#: ../../include/datetime.php:149
-msgid "Age: "
+#: ../../view/theme/redbasic/php/config.php:89
+msgid "Narrow navbar"
msgstr ""
-#: ../../include/datetime.php:151
-msgid "YYYY-MM-DD or MM-DD"
+#: ../../view/theme/redbasic/php/config.php:90
+msgid "Navigation bar background color"
msgstr ""
-#: ../../include/datetime.php:292
-msgid "less than a second ago"
+#: ../../view/theme/redbasic/php/config.php:91
+msgid "Navigation bar icon color "
msgstr ""
-#: ../../include/datetime.php:310
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
+#: ../../view/theme/redbasic/php/config.php:92
+msgid "Navigation bar active icon color "
msgstr ""
-#: ../../include/datetime.php:321
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:324
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:327
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:330
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:333
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:336
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:339
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:576
-#, php-format
-msgid "%1$s's birthday"
+#: ../../view/theme/redbasic/php/config.php:93
+msgid "Link color"
msgstr ""
-#: ../../include/datetime.php:577
-#, php-format
-msgid "Happy Birthday %1$s"
+#: ../../view/theme/redbasic/php/config.php:94
+msgid "Set font-color for banner"
msgstr ""
+#: ../../view/theme/redbasic/php/config.php:95
+msgid "Set the background color"
+=======
#: ../../include/nav.php:92
msgid "Remote authentication"
msgstr ""
@@ -13200,10 +15428,6 @@ msgstr ""
msgid "View all notifications"
msgstr ""
-#: ../../include/nav.php:190
-msgid "Mark all system notifications seen"
-msgstr ""
-
#: ../../include/nav.php:192
msgid "Private mail"
msgstr ""
@@ -13240,49 +15464,59 @@ msgstr ""
msgid "Site Setup and Configuration"
msgstr ""
-#: ../../include/nav.php:267
+#: ../../include/nav.php:277
msgid "@name, #tag, ?doc, content"
msgstr ""
-#: ../../include/nav.php:268
+#: ../../include/nav.php:278
msgid "Please wait..."
msgstr ""
-#: ../../include/nav.php:271
+#: ../../include/nav.php:280
msgid "Add Apps"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../include/nav.php:272
-msgid "Arrange Apps"
+#: ../../view/theme/redbasic/php/config.php:96
+msgid "Set the background image"
msgstr ""
-#: ../../include/nav.php:273
-msgid "Toggle System Apps"
+#: ../../view/theme/redbasic/php/config.php:97
+msgid "Set the background color of items"
msgstr ""
-#: ../../include/photos.php:115
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../view/theme/redbasic/php/config.php:98
+msgid "Set the background color of comments"
msgstr ""
-#: ../../include/photos.php:122
-msgid "Image file is empty."
+#: ../../view/theme/redbasic/php/config.php:99
+msgid "Set font-size for the entire application"
msgstr ""
-#: ../../include/photos.php:261
-msgid "Photo storage failed."
+#: ../../view/theme/redbasic/php/config.php:99
+msgid "Examples: 1rem, 100%, 16px"
msgstr ""
-#: ../../include/photos.php:301
-msgid "a new photo"
+<<<<<<< HEAD
+#: ../../view/theme/redbasic/php/config.php:100
+msgid "Set font-color for posts and comments"
msgstr ""
-#: ../../include/photos.php:305
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
+#: ../../view/theme/redbasic/php/config.php:101
+msgid "Set radius of corners"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:101
+msgid "Example: 4px"
msgstr ""
+#: ../../view/theme/redbasic/php/config.php:102
+msgid "Set shadow depth of photos"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:103
+msgid "Set maximum width of content region in pixel"
+=======
#: ../../include/photos.php:533
msgid "Upload New Photos"
msgstr ""
@@ -13300,57 +15534,65 @@ msgstr ""
msgid "Unable to verify site signature for %s"
msgstr ""
-#: ../../include/zot.php:3762
+#: ../../include/zot.php:3764
msgid "invalid target signature"
+>>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1
msgstr ""
-#: ../../include/group.php:26
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
+#: ../../view/theme/redbasic/php/config.php:103
+msgid "Leave empty for default width"
msgstr ""
-#: ../../include/group.php:268
-msgid "Add new connections to this privacy group"
+#: ../../view/theme/redbasic/php/config.php:104
+msgid "Left align page content"
msgstr ""
-#: ../../include/group.php:309
-msgid "edit"
+#: ../../view/theme/redbasic/php/config.php:105
+msgid "Set size of conversation author photo"
msgstr ""
-#: ../../include/group.php:332
-msgid "Edit group"
+#: ../../view/theme/redbasic/php/config.php:106
+msgid "Set size of followup author photos"
msgstr ""
-#: ../../include/group.php:333
-msgid "Add privacy group"
+#: ../../boot.php:1571
+msgid "Create an account to access services and applications"
msgstr ""
-#: ../../include/group.php:334
-msgid "Channels not in any privacy group"
+#: ../../boot.php:1593
+msgid "Login/Email"
msgstr ""
-#: ../../include/connections.php:128
-msgid "New window"
+#: ../../boot.php:1594
+msgid "Password"
msgstr ""
-#: ../../include/connections.php:129
-msgid "Open the selected location in a different window or browser tab"
+#: ../../boot.php:1595
+msgid "Remember me"
msgstr ""
-#: ../../include/auth.php:148
-msgid "Logged out."
+#: ../../boot.php:1598
+msgid "Forgot your password?"
msgstr ""
-#: ../../include/auth.php:275
-msgid "Failed authentication"
+#: ../../boot.php:2136
+msgid "toggle mobile"
msgstr ""
-#: ../../include/help.php:33
-msgid "Help:"
+#: ../../boot.php:2289
+#, php-format
+msgid "[$Projectname] Website SSL error for %s"
msgstr ""
-#: ../../include/help.php:65
-msgid "Not Found"
+#: ../../boot.php:2294
+msgid "Website SSL certificate is not valid. Please correct."
+msgstr ""
+
+#: ../../boot.php:2413
+#, php-format
+msgid "[$Projectname] Cron tasks not running on %s"
+msgstr ""
+
+#: ../../boot.php:2418
+msgid "Cron/Scheduled tasks not running."
msgstr ""