Merge branch 'master' into dev

author: redmatrix <git@macgirvin.com> 2016-04-08 03:32:28 -0700
committer: redmatrix <git@macgirvin.com> 2016-04-08 03:32:28 -0700
commit: 2db59f3b7697d141e6dda0aa85f9161bfee32a2a (patch)
tree: e2c93efd8dc534a5450286dbfef8eb784af46bd0
parent: 279f32b13deb45f3fe0ab2d32f6d2a0ea6e224e5 (diff)
parent: 44e21f619801ceceac32fee33b5915b437628dfa (diff)
download: volse-hubzilla-2db59f3b7697d141e6dda0aa85f9161bfee32a2a.tar.gz
volse-hubzilla-2db59f3b7697d141e6dda0aa85f9161bfee32a2a.tar.bz2
volse-hubzilla-2db59f3b7697d141e6dda0aa85f9161bfee32a2a.zip
2 files changed, 1303 insertions, 1281 deletions
diff --git a/util/hmessages.po b/util/hmessages.po
index 3aa0c1c49..295322265 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2016-04-01.1353H\n"
+"Project-Id-Version: 2016-04-08.1360H\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-01 00:03-0700\n"
+"POT-Creation-Date: 2016-04-08 00:03-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,15 +57,15 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../include/conversation.php:1037
-#: ../../include/widgets.php:1449 ../../mod/photos.php:766
-#: ../../mod/photos.php:1210
+#: ../../Zotlabs/Storage/Browser.php:164 ../../include/widgets.php:1457
+#: ../../include/apps.php:360 ../../include/apps.php:415
+#: ../../include/conversation.php:1037 ../../mod/photos.php:793
+#: ../../mod/photos.php:1237
 msgid "Unknown"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../include/apps.php:135
-#: ../../include/conversation.php:1653 ../../include/nav.php:93
+#: ../../include/conversation.php:1654 ../../include/nav.php:93
 #: ../../mod/fbrowser.php:109
 msgid "Files"
 msgstr ""
@@ -85,13 +85,13 @@ msgid "Create"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305
-#: ../../include/widgets.php:1462 ../../mod/photos.php:793
-#: ../../mod/photos.php:1334 ../../mod/profile_photo.php:401
+#: ../../include/widgets.php:1470 ../../mod/photos.php:820
+#: ../../mod/photos.php:1361 ../../mod/profile_photo.php:401
 #: ../../mod/cover_photo.php:353
 msgid "Upload"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:235 ../../mod/chat.php:235
+#: ../../Zotlabs/Storage/Browser.php:235 ../../mod/chat.php:241
 #: ../../mod/admin.php:1158 ../../mod/settings.php:599
 #: ../../mod/settings.php:625 ../../mod/sharedwithme.php:95
 msgid "Name"
@@ -112,8 +112,8 @@ msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:240 ../../include/ItemObject.php:100
 #: ../../include/apps.php:259 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36 ../../include/identity.php:930
-#: ../../include/identity.php:934 ../../include/menu.php:108
+#: ../../include/page_widgets.php:36 ../../include/identity.php:931
+#: ../../include/identity.php:935 ../../include/menu.php:108
 #: ../../mod/blocks.php:153 ../../mod/connections.php:286
 #: ../../mod/connections.php:306 ../../mod/editblock.php:135
 #: ../../mod/editlayout.php:134 ../../mod/editpost.php:112
@@ -128,7 +128,7 @@ msgstr ""
 #: ../../mod/blocks.php:155 ../../mod/connections.php:259
 #: ../../mod/connedit.php:569 ../../mod/editblock.php:181
 #: ../../mod/editlayout.php:179 ../../mod/editwebpage.php:223
-#: ../../mod/group.php:173 ../../mod/photos.php:1141 ../../mod/admin.php:993
+#: ../../mod/group.php:173 ../../mod/photos.php:1168 ../../mod/admin.php:993
 #: ../../mod/admin.php:1152 ../../mod/admin.php:1768
 #: ../../mod/settings.php:660 ../../mod/thing.php:257
 #: ../../mod/webpages.php:185
@@ -162,9 +162,9 @@ msgstr ""
 #: ../../include/attach.php:266 ../../include/attach.php:273
 #: ../../include/attach.php:338 ../../include/attach.php:352
 #: ../../include/attach.php:359 ../../include/attach.php:437
-#: ../../include/attach.php:889 ../../include/attach.php:960
-#: ../../include/attach.php:1112 ../../include/photos.php:29
-#: ../../include/items.php:4667 ../../include/chat.php:133
+#: ../../include/attach.php:895 ../../include/attach.php:966
+#: ../../include/attach.php:1118 ../../include/items.php:4671
+#: ../../include/photos.php:29 ../../include/chat.php:133
 #: ../../mod/achievements.php:30 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/appman.php:66 ../../mod/authtest.php:13 ../../mod/block.php:22
 #: ../../mod/block.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
@@ -203,12 +203,12 @@ msgstr ""
 msgid "Permission denied."
 msgstr ""
 
-#: ../../Zotlabs/Web/Router.php:105 ../../mod/help.php:217
+#: ../../Zotlabs/Web/Router.php:105 ../../mod/help.php:231
 msgid "Not Found"
 msgstr ""
 
 #: ../../Zotlabs/Web/Router.php:108 ../../mod/block.php:75
-#: ../../mod/display.php:110 ../../mod/help.php:220 ../../mod/page.php:89
+#: ../../mod/display.php:110 ../../mod/help.php:234 ../../mod/page.php:89
 msgid "Page not found."
 msgstr ""
 
@@ -249,22 +249,22 @@ msgid "I abstain"
 msgstr ""
 
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1732 ../../mod/photos.php:1094
-#: ../../mod/photos.php:1106
+#: ../../include/conversation.php:1733 ../../mod/photos.php:1121
+#: ../../mod/photos.php:1133
 msgid "View all"
 msgstr ""
 
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1756
-#: ../../include/taxonomy.php:415 ../../include/identity.php:1297
-#: ../../mod/photos.php:1098
+#: ../../include/ItemObject.php:179 ../../include/conversation.php:1757
+#: ../../include/taxonomy.php:415 ../../include/identity.php:1298
+#: ../../mod/photos.php:1125
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/ItemObject.php:184 ../../include/conversation.php:1759
-#: ../../mod/photos.php:1103
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1760
+#: ../../mod/photos.php:1130
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -299,7 +299,7 @@ msgstr ""
 msgid "Add Tag"
 msgstr ""
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:1038
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1065
 msgid "I like this (toggle)"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "like"
 msgstr ""
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:1039
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1066
 msgid "I don't like this (toggle)"
 msgstr ""
 
@@ -382,25 +382,25 @@ msgstr ""
 msgid "Mark all seen"
 msgstr ""
 
-#: ../../include/ItemObject.php:378 ../../mod/photos.php:1224
+#: ../../include/ItemObject.php:378 ../../mod/photos.php:1251
 msgctxt "noun"
 msgid "Likes"
 msgstr ""
 
-#: ../../include/ItemObject.php:379 ../../mod/photos.php:1225
+#: ../../include/ItemObject.php:379 ../../mod/photos.php:1252
 msgctxt "noun"
 msgid "Dislikes"
 msgstr ""
 
 #: ../../include/ItemObject.php:384 ../../include/acl_selectors.php:252
-#: ../../mod/photos.php:1230
+#: ../../mod/photos.php:1257
 msgid "Close"
 msgstr ""
 
 #: ../../include/ItemObject.php:389 ../../include/conversation.php:740
 #: ../../include/conversation.php:1242 ../../mod/editblock.php:150
 #: ../../mod/editlayout.php:148 ../../mod/editpost.php:129
-#: ../../mod/editwebpage.php:190 ../../mod/photos.php:1041
+#: ../../mod/editwebpage.php:190 ../../mod/photos.php:1068
 msgid "Please wait"
 msgstr ""
 
@@ -408,19 +408,19 @@ msgstr ""
 msgid "[+] show all"
 msgstr ""
 
-#: ../../include/ItemObject.php:700 ../../mod/photos.php:1057
-#: ../../mod/photos.php:1175
+#: ../../include/ItemObject.php:700 ../../mod/photos.php:1084
+#: ../../mod/photos.php:1202
 msgid "This is you"
 msgstr ""
 
 #: ../../include/ItemObject.php:702 ../../include/js_strings.php:6
-#: ../../mod/photos.php:1059 ../../mod/photos.php:1177
+#: ../../mod/photos.php:1086 ../../mod/photos.php:1204
 msgid "Comment"
 msgstr ""
 
-#: ../../include/ItemObject.php:703 ../../include/js_strings.php:22
-#: ../../include/widgets.php:708 ../../include/widgets.php:720
-#: ../../mod/appman.php:99 ../../mod/chat.php:190 ../../mod/chat.php:226
+#: ../../include/ItemObject.php:703 ../../include/widgets.php:708
+#: ../../include/widgets.php:720 ../../include/js_strings.php:22
+#: ../../mod/appman.php:99 ../../mod/chat.php:190 ../../mod/chat.php:232
 #: ../../mod/connect.php:93 ../../mod/connedit.php:729
 #: ../../mod/events.php:468 ../../mod/events.php:665
 #: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
@@ -428,8 +428,8 @@ msgstr ""
 #: ../../mod/import_items.php:116 ../../mod/invite.php:142
 #: ../../mod/locs.php:117 ../../mod/mail.php:380 ../../mod/mitem.php:231
 #: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:62
-#: ../../mod/photos.php:645 ../../mod/photos.php:1020
-#: ../../mod/photos.php:1060 ../../mod/photos.php:1178 ../../mod/admin.php:457
+#: ../../mod/photos.php:672 ../../mod/photos.php:1047
+#: ../../mod/photos.php:1087 ../../mod/photos.php:1205 ../../mod/admin.php:457
 #: ../../mod/admin.php:646 ../../mod/admin.php:721 ../../mod/admin.php:986
 #: ../../mod/admin.php:1150 ../../mod/admin.php:1326 ../../mod/admin.php:1521
 #: ../../mod/admin.php:1606 ../../mod/admin.php:1770 ../../mod/poke.php:182
@@ -489,7 +489,7 @@ msgstr ""
 #: ../../include/ItemObject.php:712 ../../include/conversation.php:1184
 #: ../../include/page_widgets.php:40 ../../mod/editblock.php:171
 #: ../../mod/editpost.php:149 ../../mod/editwebpage.php:212
-#: ../../mod/events.php:465 ../../mod/photos.php:1061
+#: ../../mod/events.php:465 ../../mod/photos.php:1088
 #: ../../mod/webpages.php:190
 msgid "Preview"
 msgstr ""
@@ -512,6 +512,404 @@ msgstr ""
 msgid "Import completed."
 msgstr ""
 
+#: ../../include/widgets.php:46 ../../include/contact_widgets.php:95
+#: ../../include/taxonomy.php:282
+msgid "Categories"
+msgstr ""
+
+#: ../../include/widgets.php:102 ../../include/nav.php:159
+#: ../../mod/apps.php:36
+msgid "Apps"
+msgstr ""
+
+#: ../../include/widgets.php:103
+msgid "System"
+msgstr ""
+
+#: ../../include/widgets.php:105 ../../include/conversation.php:1541
+#: ../../mod/profiles.php:696
+msgid "Personal"
+msgstr ""
+
+#: ../../include/widgets.php:106
+msgid "Create Personal App"
+msgstr ""
+
+#: ../../include/widgets.php:107
+msgid "Edit Personal App"
+msgstr ""
+
+#: ../../include/widgets.php:147 ../../include/widgets.php:184
+#: ../../include/conversation.php:961 ../../include/identity.php:1008
+#: ../../include/Contact.php:101 ../../mod/directory.php:321
+#: ../../mod/match.php:64 ../../mod/suggest.php:52
+msgid "Connect"
+msgstr ""
+
+#: ../../include/widgets.php:149 ../../mod/suggest.php:54
+msgid "Ignore/Hide"
+msgstr ""
+
+#: ../../include/widgets.php:154
+msgid "Suggestions"
+msgstr ""
+
+#: ../../include/widgets.php:155
+msgid "See more..."
+msgstr ""
+
+#: ../../include/widgets.php:175
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr ""
+
+#: ../../include/widgets.php:181
+msgid "Add New Connection"
+msgstr ""
+
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
+msgstr ""
+
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr ""
+
+#: ../../include/widgets.php:199
+msgid "Notes"
+msgstr ""
+
+#: ../../include/widgets.php:201 ../../include/text.php:905
+#: ../../include/text.php:917 ../../mod/filer.php:49 ../../mod/admin.php:1687
+#: ../../mod/admin.php:1707 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100
+msgid "Save"
+msgstr ""
+
+#: ../../include/widgets.php:273
+msgid "Remove term"
+msgstr ""
+
+#: ../../include/widgets.php:281 ../../include/features.php:84
+msgid "Saved Searches"
+msgstr ""
+
+#: ../../include/widgets.php:282 ../../include/group.php:316
+msgid "add"
+msgstr ""
+
+#: ../../include/widgets.php:310 ../../include/contact_widgets.php:57
+#: ../../include/features.php:97
+msgid "Saved Folders"
+msgstr ""
+
+#: ../../include/widgets.php:313 ../../include/contact_widgets.php:60
+#: ../../include/contact_widgets.php:98
+msgid "Everything"
+msgstr ""
+
+#: ../../include/widgets.php:354
+msgid "Archives"
+msgstr ""
+
+#: ../../include/widgets.php:444 ../../mod/connedit.php:589
+msgid "Me"
+msgstr ""
+
+#: ../../include/widgets.php:445 ../../mod/connedit.php:590
+msgid "Family"
+msgstr ""
+
+#: ../../include/widgets.php:446 ../../include/profile_selectors.php:80
+#: ../../include/identity.php:389 ../../include/identity.php:390
+#: ../../include/identity.php:397 ../../mod/connedit.php:591
+#: ../../mod/settings.php:349 ../../mod/settings.php:353
+#: ../../mod/settings.php:354 ../../mod/settings.php:357
+#: ../../mod/settings.php:368
+msgid "Friends"
+msgstr ""
+
+#: ../../include/widgets.php:447 ../../mod/connedit.php:592
+msgid "Acquaintances"
+msgstr ""
+
+#: ../../include/widgets.php:448 ../../mod/connections.php:88
+#: ../../mod/connections.php:103 ../../mod/connedit.php:593
+msgid "All"
+msgstr ""
+
+#: ../../include/widgets.php:467
+msgid "Refresh"
+msgstr ""
+
+#: ../../include/widgets.php:507
+msgid "Account settings"
+msgstr ""
+
+#: ../../include/widgets.php:513
+msgid "Channel settings"
+msgstr ""
+
+#: ../../include/widgets.php:522
+msgid "Additional features"
+msgstr ""
+
+#: ../../include/widgets.php:529
+msgid "Feature/Addon settings"
+msgstr ""
+
+#: ../../include/widgets.php:535
+msgid "Display settings"
+msgstr ""
+
+#: ../../include/widgets.php:542
+msgid "Manage locations"
+msgstr ""
+
+#: ../../include/widgets.php:551
+msgid "Export channel"
+msgstr ""
+
+#: ../../include/widgets.php:558
+msgid "Connected apps"
+msgstr ""
+
+#: ../../include/widgets.php:565 ../../mod/connedit.php:701
+msgid "Connection Default Permissions"
+msgstr ""
+
+#: ../../include/widgets.php:573
+msgid "Premium Channel Settings"
+msgstr ""
+
+#: ../../include/widgets.php:581 ../../include/features.php:71
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
+msgstr ""
+
+#: ../../include/widgets.php:589 ../../include/apps.php:134
+#: ../../include/nav.php:205 ../../mod/admin.php:1266 ../../mod/admin.php:1488
+msgid "Settings"
+msgstr ""
+
+#: ../../include/widgets.php:602
+msgid "Private Mail Menu"
+msgstr ""
+
+#: ../../include/widgets.php:604
+msgid "Combined View"
+msgstr ""
+
+#: ../../include/widgets.php:609 ../../include/nav.php:193
+msgid "Inbox"
+msgstr ""
+
+#: ../../include/widgets.php:614 ../../include/nav.php:194
+msgid "Outbox"
+msgstr ""
+
+#: ../../include/widgets.php:619 ../../include/nav.php:195
+msgid "New Message"
+msgstr ""
+
+#: ../../include/widgets.php:636 ../../include/widgets.php:648
+msgid "Conversations"
+msgstr ""
+
+#: ../../include/widgets.php:640
+msgid "Received Messages"
+msgstr ""
+
+#: ../../include/widgets.php:644
+msgid "Sent Messages"
+msgstr ""
+
+#: ../../include/widgets.php:658
+msgid "No messages."
+msgstr ""
+
+#: ../../include/widgets.php:676
+msgid "Delete conversation"
+msgstr ""
+
+#: ../../include/widgets.php:702
+msgid "Events Menu"
+msgstr ""
+
+#: ../../include/widgets.php:703
+msgid "Day View"
+msgstr ""
+
+#: ../../include/widgets.php:704
+msgid "Week View"
+msgstr ""
+
+#: ../../include/widgets.php:705
+msgid "Month View"
+msgstr ""
+
+#: ../../include/widgets.php:706 ../../mod/events.php:661
+#: ../../mod/cal.php:328
+msgid "Export"
+msgstr ""
+
+#: ../../include/widgets.php:707 ../../mod/events.php:664
+#: ../../mod/cal.php:331
+msgid "Import"
+msgstr ""
+
+#: ../../include/widgets.php:717
+msgid "Events Tools"
+msgstr ""
+
+#: ../../include/widgets.php:718
+msgid "Export Calendar"
+msgstr ""
+
+#: ../../include/widgets.php:719
+msgid "Import Calendar"
+msgstr ""
+
+#: ../../include/widgets.php:794 ../../include/conversation.php:1678
+#: ../../include/conversation.php:1681
+msgid "Chatrooms"
+msgstr ""
+
+#: ../../include/widgets.php:798
+msgid "Overview"
+msgstr ""
+
+#: ../../include/widgets.php:805
+msgid "Chat Members"
+msgstr ""
+
+#: ../../include/widgets.php:828
+msgid "Bookmarked Chatrooms"
+msgstr ""
+
+#: ../../include/widgets.php:851
+msgid "Suggested Chatrooms"
+msgstr ""
+
+#: ../../include/widgets.php:996 ../../include/widgets.php:1108
+msgid "photo/image"
+msgstr ""
+
+#: ../../include/widgets.php:1051
+msgid "Click to show more"
+msgstr ""
+
+#: ../../include/widgets.php:1202
+msgid "Rating Tools"
+msgstr ""
+
+#: ../../include/widgets.php:1206 ../../include/widgets.php:1208
+msgid "Rate Me"
+msgstr ""
+
+#: ../../include/widgets.php:1211
+msgid "View Ratings"
+msgstr ""
+
+#: ../../include/widgets.php:1222 ../../mod/pubsites.php:18
+msgid "Public Hubs"
+msgstr ""
+
+#: ../../include/widgets.php:1268
+msgid "Forums"
+msgstr ""
+
+#: ../../include/widgets.php:1297
+msgid "Tasks"
+msgstr ""
+
+#: ../../include/widgets.php:1306
+msgid "Documentation"
+msgstr ""
+
+#: ../../include/widgets.php:1308
+msgid "Project/Site Information"
+msgstr ""
+
+#: ../../include/widgets.php:1309
+msgid "For Members"
+msgstr ""
+
+#: ../../include/widgets.php:1310
+msgid "For Administrators"
+msgstr ""
+
+#: ../../include/widgets.php:1311
+msgid "For Developers"
+msgstr ""
+
+#: ../../include/widgets.php:1334 ../../mod/admin.php:456
+msgid "Site"
+msgstr ""
+
+#: ../../include/widgets.php:1335
+msgid "Accounts"
+msgstr ""
+
+#: ../../include/widgets.php:1335 ../../include/widgets.php:1373
+msgid "Member registrations waiting for confirmation"
+msgstr ""
+
+#: ../../include/widgets.php:1336 ../../mod/admin.php:1149
+msgid "Channels"
+msgstr ""
+
+#: ../../include/widgets.php:1337 ../../mod/admin.php:710
+msgid "Security"
+msgstr ""
+
+#: ../../include/widgets.php:1338 ../../include/apps.php:152
+msgid "Features"
+msgstr ""
+
+#: ../../include/widgets.php:1339 ../../mod/admin.php:1264
+#: ../../mod/admin.php:1325
+msgid "Plugins"
+msgstr ""
+
+#: ../../include/widgets.php:1340 ../../mod/admin.php:1486
+#: ../../mod/admin.php:1520
+msgid "Themes"
+msgstr ""
+
+#: ../../include/widgets.php:1341
+msgid "Inspect queue"
+msgstr ""
+
+#: ../../include/widgets.php:1342 ../../mod/admin.php:1760
+msgid "Profile Fields"
+msgstr ""
+
+#: ../../include/widgets.php:1343
+msgid "DB updates"
+msgstr ""
+
+#: ../../include/widgets.php:1361 ../../include/widgets.php:1371
+#: ../../mod/admin.php:1605
+msgid "Logs"
+msgstr ""
+
+#: ../../include/widgets.php:1368 ../../include/nav.php:213
+msgid "Admin"
+msgstr ""
+
+#: ../../include/widgets.php:1369
+msgid "Plugin Features"
+msgstr ""
+
+#: ../../include/widgets.php:1451 ../../mod/photos.php:787
+#: ../../mod/photos.php:1328
+msgid "View Photo"
+msgstr ""
+
+#: ../../include/widgets.php:1468 ../../mod/photos.php:818
+msgid "Edit Album"
+msgstr ""
+
 #: ../../include/activities.php:42
 msgid " and "
 msgstr ""
@@ -543,7 +941,7 @@ msgstr ""
 msgid "Site Admin"
 msgstr ""
 
-#: ../../include/apps.php:129 ../../include/conversation.php:1690
+#: ../../include/apps.php:129 ../../include/conversation.php:1691
 #: ../../include/nav.php:102
 msgid "Bookmarks"
 msgstr ""
@@ -552,59 +950,53 @@ msgstr ""
 msgid "Address Book"
 msgstr ""
 
-#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1579
+#: ../../include/apps.php:131 ../../include/nav.php:110 ../../boot.php:1580
 msgid "Login"
 msgstr ""
 
-#: ../../include/apps.php:132 ../../include/nav.php:201
+#: ../../include/apps.php:132 ../../include/nav.php:203
 #: ../../mod/manage.php:158
 msgid "Channel Manager"
 msgstr ""
 
-#: ../../include/apps.php:133 ../../include/nav.php:174
+#: ../../include/apps.php:133 ../../include/nav.php:176
 msgid "Grid"
 msgstr ""
 
-#: ../../include/apps.php:134 ../../include/nav.php:203
-#: ../../include/widgets.php:589 ../../mod/admin.php:1266
-#: ../../mod/admin.php:1488
-msgid "Settings"
-msgstr ""
-
-#: ../../include/apps.php:136 ../../include/conversation.php:1700
+#: ../../include/apps.php:136 ../../include/conversation.php:1701
 #: ../../include/nav.php:106 ../../mod/webpages.php:180
 msgid "Webpages"
 msgstr ""
 
-#: ../../include/apps.php:137 ../../include/nav.php:177
+#: ../../include/apps.php:137 ../../include/nav.php:179
 msgid "Channel Home"
 msgstr ""
 
-#: ../../include/apps.php:138 ../../include/identity.php:1388
+#: ../../include/apps.php:138 ../../include/identity.php:1389
 #: ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
 
-#: ../../include/apps.php:139 ../../include/conversation.php:1646
+#: ../../include/apps.php:139 ../../include/conversation.php:1647
 #: ../../include/nav.php:92 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr ""
 
-#: ../../include/apps.php:140 ../../include/conversation.php:1663
-#: ../../include/conversation.php:1666 ../../include/nav.php:196
+#: ../../include/apps.php:140 ../../include/conversation.php:1664
+#: ../../include/conversation.php:1667 ../../include/nav.php:198
 msgid "Events"
 msgstr ""
 
-#: ../../include/apps.php:141 ../../include/nav.php:162
+#: ../../include/apps.php:141 ../../include/nav.php:164
 msgid "Directory"
 msgstr ""
 
-#: ../../include/apps.php:142 ../../include/nav.php:153 ../../mod/help.php:208
-#: ../../mod/help.php:213 ../../mod/layouts.php:176
+#: ../../include/apps.php:142 ../../include/nav.php:155 ../../mod/help.php:222
+#: ../../mod/help.php:227 ../../mod/layouts.php:176
 msgid "Help"
 msgstr ""
 
-#: ../../include/apps.php:143 ../../include/nav.php:188
+#: ../../include/apps.php:143 ../../include/nav.php:190
 msgid "Mail"
 msgstr ""
 
@@ -621,7 +1013,7 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: ../../include/apps.php:147 ../../include/nav.php:159
+#: ../../include/apps.php:147 ../../include/nav.php:161
 #: ../../include/text.php:904 ../../include/text.php:916
 #: ../../mod/connections.php:302 ../../mod/search.php:40
 msgid "Search"
@@ -643,10 +1035,6 @@ msgstr ""
 msgid "Invite"
 msgstr ""
 
-#: ../../include/apps.php:152 ../../include/widgets.php:1330
-msgid "Features"
-msgstr ""
-
 #: ../../include/apps.php:153 ../../mod/id.php:28
 msgid "Language"
 msgstr ""
@@ -673,68 +1061,6 @@ msgstr ""
 msgid "Purchase"
 msgstr ""
 
-#: ../../include/attach.php:247 ../../include/attach.php:333
-msgid "Item was not found."
-msgstr ""
-
-#: ../../include/attach.php:497
-msgid "No source file."
-msgstr ""
-
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
-msgstr ""
-
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
-msgstr ""
-
-#: ../../include/attach.php:672
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr ""
-
-#: ../../include/attach.php:686
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr ""
-
-#: ../../include/attach.php:842
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr ""
-
-#: ../../include/attach.php:855
-msgid "Stored file could not be verified. Upload failed."
-msgstr ""
-
-#: ../../include/attach.php:903 ../../include/attach.php:919
-msgid "Path not available."
-msgstr ""
-
-#: ../../include/attach.php:965 ../../include/attach.php:1117
-msgid "Empty pathname"
-msgstr ""
-
-#: ../../include/attach.php:991
-msgid "duplicate filename or path"
-msgstr ""
-
-#: ../../include/attach.php:1013
-msgid "Path not found."
-msgstr ""
-
-#: ../../include/attach.php:1071
-msgid "mkdir failed."
-msgstr ""
-
-#: ../../include/attach.php:1075
-msgid "database storage failed."
-msgstr ""
-
-#: ../../include/attach.php:1123
-msgid "Empty path"
-msgstr ""
-
 #: ../../include/auth.php:105
 msgid "Logged out."
 msgstr ""
@@ -834,7 +1160,7 @@ msgid "Finishes:"
 msgstr ""
 
 #: ../../include/bb2diaspora.php:487 ../../include/event.php:52
-#: ../../include/text.php:1452 ../../include/identity.php:1022
+#: ../../include/identity.php:1023 ../../include/text.php:1452
 #: ../../mod/directory.php:307
 msgid "Location:"
 msgstr ""
@@ -844,6 +1170,23 @@ msgstr ""
 msgid "%1$s's bookmarks"
 msgstr ""
 
+#: ../../include/zot.php:680
+msgid "Invalid data packet"
+msgstr ""
+
+#: ../../include/zot.php:696
+msgid "Unable to verify channel signature"
+msgstr ""
+
+#: ../../include/zot.php:2332
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr ""
+
+#: ../../include/zot.php:3670
+msgid "invalid target signature"
+msgstr ""
+
 #: ../../include/contact_widgets.php:14
 #, php-format
 msgid "%d invitation available"
@@ -893,21 +1236,6 @@ msgstr ""
 msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: ../../include/contact_widgets.php:57 ../../include/features.php:97
-#: ../../include/widgets.php:310
-msgid "Saved Folders"
-msgstr ""
-
-#: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:98
-#: ../../include/widgets.php:313
-msgid "Everything"
-msgstr ""
-
-#: ../../include/contact_widgets.php:95 ../../include/taxonomy.php:282
-#: ../../include/widgets.php:46
-msgid "Categories"
-msgstr ""
-
 #: ../../include/contact_widgets.php:128
 #, php-format
 msgid "%d connection in common"
@@ -919,6 +1247,245 @@ msgstr[1] ""
 msgid "show more"
 msgstr ""
 
+#: ../../include/dir_fns.php:139
+msgid "Directory Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:141
+msgid "Safe Mode"
+msgstr ""
+
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/api.php:102
+#: ../../mod/connedit.php:375 ../../mod/connedit.php:653
+#: ../../mod/events.php:454 ../../mod/events.php:455 ../../mod/events.php:464
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../mod/photos.php:661 ../../mod/admin.php:425 ../../mod/profiles.php:647
+#: ../../mod/removeme.php:60 ../../mod/settings.php:588
+#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1584
+msgid "No"
+msgstr ""
+
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/api.php:101
+#: ../../mod/connedit.php:375 ../../mod/events.php:454
+#: ../../mod/events.php:455 ../../mod/events.php:464
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../mod/photos.php:661 ../../mod/admin.php:427 ../../mod/profiles.php:647
+#: ../../mod/removeme.php:60 ../../mod/settings.php:588
+#: ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1584
+msgid "Yes"
+msgstr ""
+
+#: ../../include/dir_fns.php:142
+msgid "Public Forums Only"
+msgstr ""
+
+#: ../../include/dir_fns.php:143
+msgid "This Website Only"
+msgstr ""
+
+#: ../../include/enotify.php:57 ../../include/network.php:1827
+msgid "$Projectname Notification"
+msgstr ""
+
+#: ../../include/enotify.php:58 ../../include/network.php:1828
+msgid "$projectname"
+msgstr ""
+
+#: ../../include/enotify.php:60 ../../include/network.php:1830
+msgid "Thank You,"
+msgstr ""
+
+#: ../../include/enotify.php:62 ../../include/network.php:1832
+#, php-format
+msgid "%s Administrator"
+msgstr ""
+
+#: ../../include/enotify.php:96
+#, php-format
+msgid "%s <!item_type!>"
+msgstr ""
+
+#: ../../include/enotify.php:100
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr ""
+
+#: ../../include/enotify.php:102
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr ""
+
+#: ../../include/enotify.php:103
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr ""
+
+#: ../../include/enotify.php:103
+msgid "a private message"
+msgstr ""
+
+#: ../../include/enotify.php:104
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr ""
+
+#: ../../include/enotify.php:160
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:168
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:177
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:188
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr ""
+
+#: ../../include/enotify.php:189
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr ""
+
+#: ../../include/enotify.php:192 ../../include/enotify.php:207
+#: ../../include/enotify.php:233 ../../include/enotify.php:251
+#: ../../include/enotify.php:265
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr ""
+
+#: ../../include/enotify.php:198
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr ""
+
+#: ../../include/enotify.php:200
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:202
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:226
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr ""
+
+#: ../../include/enotify.php:227
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:228
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr ""
+
+#: ../../include/enotify.php:240
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr ""
+
+#: ../../include/enotify.php:241
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:242
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr ""
+
+#: ../../include/enotify.php:258
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr ""
+
+#: ../../include/enotify.php:259
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:260
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr ""
+
+#: ../../include/enotify.php:272
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr ""
+
+#: ../../include/enotify.php:273
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:274
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+msgstr ""
+
+#: ../../include/enotify.php:278 ../../include/enotify.php:297
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr ""
+
+#: ../../include/enotify.php:280
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr ""
+
+#: ../../include/enotify.php:287
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr ""
+
+#: ../../include/enotify.php:288
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:289
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+msgstr ""
+
+#: ../../include/enotify.php:295
+msgid "Name:"
+msgstr ""
+
+#: ../../include/enotify.php:296
+msgid "Photo:"
+msgstr ""
+
+#: ../../include/enotify.php:299
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr ""
+
+#: ../../include/enotify.php:514
+msgid "[Hubzilla:Notify]"
+msgstr ""
+
 #: ../../include/conversation.php:120 ../../include/text.php:1967
 #: ../../mod/like.php:367 ../../mod/subthread.php:83 ../../mod/tagger.php:43
 msgid "photo"
@@ -975,42 +1542,42 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1075
+#: ../../include/conversation.php:574 ../../mod/photos.php:1102
 msgctxt "title"
 msgid "Likes"
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1075
+#: ../../include/conversation.php:574 ../../mod/photos.php:1102
 msgctxt "title"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1076
+#: ../../include/conversation.php:575 ../../mod/photos.php:1103
 msgctxt "title"
 msgid "Agree"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1076
+#: ../../include/conversation.php:575 ../../mod/photos.php:1103
 msgctxt "title"
 msgid "Disagree"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1076
+#: ../../include/conversation.php:575 ../../mod/photos.php:1103
 msgctxt "title"
 msgid "Abstain"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1077
+#: ../../include/conversation.php:576 ../../mod/photos.php:1104
 msgctxt "title"
 msgid "Attending"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1077
+#: ../../include/conversation.php:576 ../../mod/photos.php:1104
 msgctxt "title"
 msgid "Not attending"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1077
+#: ../../include/conversation.php:576 ../../mod/photos.php:1104
 msgctxt "title"
 msgid "Might attend"
 msgstr ""
@@ -1036,7 +1603,7 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
-#: ../../include/conversation.php:854 ../../include/nav.php:242
+#: ../../include/conversation.php:854 ../../include/nav.php:244
 msgid "Loading..."
 msgstr ""
 
@@ -1065,13 +1632,6 @@ msgstr ""
 msgid "Activity/Posts"
 msgstr ""
 
-#: ../../include/conversation.php:961 ../../include/widgets.php:147
-#: ../../include/widgets.php:184 ../../include/identity.php:1007
-#: ../../include/Contact.php:101 ../../mod/directory.php:321
-#: ../../mod/match.php:64 ../../mod/suggest.php:52
-msgid "Connect"
-msgstr ""
-
 #: ../../include/conversation.php:962
 msgid "Edit Connection"
 msgstr ""
@@ -1165,7 +1725,7 @@ msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
 #: ../../include/conversation.php:1207 ../../mod/blocks.php:154
-#: ../../mod/layouts.php:184 ../../mod/photos.php:1040
+#: ../../mod/layouts.php:184 ../../mod/photos.php:1067
 #: ../../mod/webpages.php:184
 msgid "Share"
 msgstr ""
@@ -1327,11 +1887,6 @@ msgstr ""
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/conversation.php:1541 ../../include/widgets.php:105
-#: ../../mod/profiles.php:696
-msgid "Personal"
-msgstr ""
-
 #: ../../include/conversation.php:1544
 msgid "Posts that mention or involve you"
 msgstr ""
@@ -1361,367 +1916,294 @@ msgstr ""
 msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/conversation.php:1625 ../../mod/admin.php:1157
+#: ../../include/conversation.php:1626 ../../mod/admin.php:1157
 msgid "Channel"
 msgstr ""
 
-#: ../../include/conversation.php:1628
+#: ../../include/conversation.php:1629
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/conversation.php:1637
+#: ../../include/conversation.php:1638
 msgid "About"
 msgstr ""
 
-#: ../../include/conversation.php:1640
+#: ../../include/conversation.php:1641
 msgid "Profile Details"
 msgstr ""
 
-#: ../../include/conversation.php:1649 ../../include/photos.php:506
+#: ../../include/conversation.php:1650 ../../include/photos.php:506
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/conversation.php:1656
+#: ../../include/conversation.php:1657
 msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/conversation.php:1677 ../../include/conversation.php:1680
-msgid "Chatrooms"
-msgstr ""
-
-#: ../../include/conversation.php:1693
+#: ../../include/conversation.php:1694
 msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/conversation.php:1703
+#: ../../include/conversation.php:1704
 msgid "Manage Webpages"
 msgstr ""
 
-#: ../../include/conversation.php:1762
+#: ../../include/conversation.php:1763
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1765
+#: ../../include/conversation.php:1766
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1768
+#: ../../include/conversation.php:1769
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1771
+#: ../../include/conversation.php:1772
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1774
+#: ../../include/conversation.php:1775
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1777
+#: ../../include/conversation.php:1778
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/dir_fns.php:139
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:141
-msgid "Safe Mode"
-msgstr ""
-
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/api.php:102
-#: ../../mod/connedit.php:375 ../../mod/connedit.php:653
-#: ../../mod/events.php:454 ../../mod/events.php:455 ../../mod/events.php:464
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../mod/photos.php:634 ../../mod/admin.php:425 ../../mod/profiles.php:647
-#: ../../mod/removeme.php:60 ../../mod/settings.php:588
-#: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1583
-msgid "No"
-msgstr ""
-
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/api.php:101
-#: ../../mod/connedit.php:375 ../../mod/events.php:454
-#: ../../mod/events.php:455 ../../mod/events.php:464
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../mod/photos.php:634 ../../mod/admin.php:427 ../../mod/profiles.php:647
-#: ../../mod/removeme.php:60 ../../mod/settings.php:588
-#: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1583
-msgid "Yes"
-msgstr ""
-
-#: ../../include/dir_fns.php:142
-msgid "Public Forums Only"
+#: ../../include/dba/dba_driver.php:141
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/dir_fns.php:143
-msgid "This Website Only"
+#: ../../include/follow.php:28
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/enotify.php:57 ../../include/network.php:1809
-msgid "$Projectname Notification"
+#: ../../include/follow.php:33
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/enotify.php:58 ../../include/network.php:1810
-msgid "$projectname"
+#: ../../include/follow.php:82
+msgid "Response from remote channel was incomplete."
 msgstr ""
 
-#: ../../include/enotify.php:60 ../../include/network.php:1812
-msgid "Thank You,"
+#: ../../include/follow.php:99
+msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/enotify.php:62 ../../include/network.php:1814
-#, php-format
-msgid "%s Administrator"
+#: ../../include/follow.php:155 ../../include/follow.php:191
+msgid "Protocol disabled."
 msgstr ""
 
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
+#: ../../include/follow.php:179
+msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Hubzilla:Notify] New mail received at %s"
+#: ../../include/follow.php:217
+msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1579
+msgid "Logout"
 msgstr ""
 
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
+#: ../../include/nav.php:82 ../../include/nav.php:113
+msgid "End this session"
 msgstr ""
 
-#: ../../include/enotify.php:103
-msgid "a private message"
+#: ../../include/nav.php:85 ../../include/nav.php:144
+msgid "Home"
 msgstr ""
 
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/enotify.php:160
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+#: ../../include/nav.php:86
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/enotify.php:168
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+#: ../../include/nav.php:88 ../../include/identity.php:931
+#: ../../mod/profiles.php:776
+msgid "Edit Profiles"
 msgstr ""
 
-#: ../../include/enotify.php:177
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/enotify.php:188
-#, php-format
-msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../include/nav.php:90 ../../include/identity.php:935
+msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/enotify.php:189
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+#: ../../include/nav.php:90
+msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/enotify.php:192 ../../include/enotify.php:207
-#: ../../include/enotify.php:233 ../../include/enotify.php:251
-#: ../../include/enotify.php:265
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../include/nav.php:92
+msgid "Your photos"
 msgstr ""
 
-#: ../../include/enotify.php:198
-#, php-format
-msgid "[Hubzilla:Notify] %s posted to your profile wall"
+#: ../../include/nav.php:93
+msgid "Your files"
 msgstr ""
 
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../include/nav.php:96
+msgid "Your chatrooms"
 msgstr ""
 
-#: ../../include/enotify.php:202
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+#: ../../include/nav.php:102
+msgid "Your bookmarks"
 msgstr ""
 
-#: ../../include/enotify.php:226
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged you"
+#: ../../include/nav.php:106
+msgid "Your webpages"
 msgstr ""
 
-#: ../../include/enotify.php:227
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+#: ../../include/nav.php:110
+msgid "Sign in"
 msgstr ""
 
-#: ../../include/enotify.php:228
+#: ../../include/nav.php:127
 #, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgid "%s - click to logout"
 msgstr ""
 
-#: ../../include/enotify.php:240
-#, php-format
-msgid "[Hubzilla:Notify] %1$s poked you"
+#: ../../include/nav.php:130
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/enotify.php:241
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+#: ../../include/nav.php:130
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/enotify.php:242
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+#: ../../include/nav.php:144
+msgid "Home Page"
 msgstr ""
 
-#: ../../include/enotify.php:258
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged your post"
+#: ../../include/nav.php:148 ../../mod/register.php:258 ../../boot.php:1562
+msgid "Register"
 msgstr ""
 
-#: ../../include/enotify.php:259
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+#: ../../include/nav.php:148
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/enotify.php:260
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+#: ../../include/nav.php:155
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/enotify.php:272
-msgid "[Hubzilla:Notify] Introduction received"
+#: ../../include/nav.php:159
+msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/enotify.php:273
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+#: ../../include/nav.php:161
+msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/enotify.php:274
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+#: ../../include/nav.php:164
+msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/enotify.php:278 ../../include/enotify.php:297
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../include/nav.php:176
+msgid "Your grid"
 msgstr ""
 
-#: ../../include/enotify.php:280
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
+#: ../../include/nav.php:177
+msgid "Mark all grid notifications seen"
 msgstr ""
 
-#: ../../include/enotify.php:287
-msgid "[Hubzilla:Notify] Friend suggestion received"
+#: ../../include/nav.php:179
+msgid "Channel home"
 msgstr ""
 
-#: ../../include/enotify.php:288
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+#: ../../include/nav.php:180
+msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/enotify.php:289
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+#: ../../include/nav.php:183 ../../include/text.php:834
+#: ../../mod/connections.php:298
+msgid "Connections"
 msgstr ""
 
-#: ../../include/enotify.php:295
-msgid "Name:"
+#: ../../include/nav.php:186
+msgid "Notices"
 msgstr ""
 
-#: ../../include/enotify.php:296
-msgid "Photo:"
+#: ../../include/nav.php:186
+msgid "Notifications"
 msgstr ""
 
-#: ../../include/enotify.php:299
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../include/nav.php:187
+msgid "See all notifications"
 msgstr ""
 
-#: ../../include/enotify.php:514
-msgid "[Hubzilla:Notify]"
+#: ../../include/nav.php:188 ../../mod/notifications.php:99
+msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../include/dba/dba_driver.php:141
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+#: ../../include/nav.php:190
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
+#: ../../include/nav.php:191
+msgid "See all private messages"
 msgstr ""
 
-#: ../../include/follow.php:33
-msgid "Channel location missing."
+#: ../../include/nav.php:192
+msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/follow.php:82
-msgid "Response from remote channel was incomplete."
+#: ../../include/nav.php:198
+msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/follow.php:99
-msgid "Channel was deleted and no longer exists."
+#: ../../include/nav.php:199
+msgid "See all events"
 msgstr ""
 
-#: ../../include/follow.php:155 ../../include/follow.php:191
-msgid "Protocol disabled."
+#: ../../include/nav.php:200
+msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/follow.php:179
-msgid "Channel discovery failed."
+#: ../../include/nav.php:203
+msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/follow.php:217
-msgid "Cannot connect to yourself."
+#: ../../include/nav.php:205
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
+#: ../../include/nav.php:213
+msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
+#: ../../include/nav.php:249
+msgid "@name, #tag, ?doc, content"
 msgstr ""
 
-#: ../../include/import.php:80 ../../mod/import.php:146
-msgid "Cloned channel not found. Import failed."
+#: ../../include/nav.php:250
+msgid "Please wait..."
 msgstr ""
 
 #: ../../include/js_strings.php:5
@@ -2052,220 +2534,16 @@ msgctxt "calendar"
 msgid "All day"
 msgstr ""
 
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1578
-msgid "Logout"
-msgstr ""
-
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
-msgstr ""
-
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
-msgstr ""
-
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr ""
-
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr ""
-
-#: ../../include/nav.php:88 ../../include/identity.php:930
-#: ../../mod/profiles.php:776
-msgid "Edit Profiles"
-msgstr ""
-
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr ""
-
-#: ../../include/nav.php:90 ../../include/identity.php:934
-msgid "Edit Profile"
-msgstr ""
-
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr ""
-
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr ""
-
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr ""
-
-#: ../../include/nav.php:96
-msgid "Your chatrooms"
-msgstr ""
-
-#: ../../include/nav.php:102
-msgid "Your bookmarks"
-msgstr ""
-
-#: ../../include/nav.php:106
-msgid "Your webpages"
-msgstr ""
-
-#: ../../include/nav.php:110
-msgid "Sign in"
-msgstr ""
-
-#: ../../include/nav.php:127
-#, php-format
-msgid "%s - click to logout"
-msgstr ""
-
-#: ../../include/nav.php:130
-msgid "Remote authentication"
-msgstr ""
-
-#: ../../include/nav.php:130
-msgid "Click to authenticate to your home hub"
-msgstr ""
-
-#: ../../include/nav.php:144
-msgid "Home Page"
-msgstr ""
-
-#: ../../include/nav.php:148 ../../mod/register.php:258 ../../boot.php:1561
-msgid "Register"
-msgstr ""
-
-#: ../../include/nav.php:148
-msgid "Create an account"
-msgstr ""
-
-#: ../../include/nav.php:153
-msgid "Help and documentation"
-msgstr ""
-
-#: ../../include/nav.php:157 ../../include/widgets.php:102
-#: ../../mod/apps.php:36
-msgid "Apps"
-msgstr ""
-
-#: ../../include/nav.php:157
-msgid "Applications, utilities, links, games"
-msgstr ""
-
-#: ../../include/nav.php:159
-msgid "Search site @name, #tag, ?docs, content"
-msgstr ""
-
-#: ../../include/nav.php:162
-msgid "Channel Directory"
-msgstr ""
-
-#: ../../include/nav.php:174
-msgid "Your grid"
-msgstr ""
-
-#: ../../include/nav.php:175
-msgid "Mark all grid notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:177
-msgid "Channel home"
-msgstr ""
-
-#: ../../include/nav.php:178
-msgid "Mark all channel notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:181 ../../include/text.php:834
-#: ../../mod/connections.php:298
-msgid "Connections"
-msgstr ""
-
-#: ../../include/nav.php:184
-msgid "Notices"
-msgstr ""
-
-#: ../../include/nav.php:184
-msgid "Notifications"
-msgstr ""
-
-#: ../../include/nav.php:185
-msgid "See all notifications"
-msgstr ""
-
-#: ../../include/nav.php:186 ../../mod/notifications.php:99
-msgid "Mark all system notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:188
-msgid "Private mail"
-msgstr ""
-
-#: ../../include/nav.php:189
-msgid "See all private messages"
-msgstr ""
-
-#: ../../include/nav.php:190
-msgid "Mark all private messages seen"
-msgstr ""
-
-#: ../../include/nav.php:191 ../../include/widgets.php:609
-msgid "Inbox"
-msgstr ""
-
-#: ../../include/nav.php:192 ../../include/widgets.php:614
-msgid "Outbox"
-msgstr ""
-
-#: ../../include/nav.php:193 ../../include/widgets.php:619
-msgid "New Message"
-msgstr ""
-
-#: ../../include/nav.php:196
-msgid "Event Calendar"
-msgstr ""
-
-#: ../../include/nav.php:197
-msgid "See all 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 ../../include/widgets.php:1360
-msgid "Admin"
-msgstr ""
-
-#: ../../include/nav.php:211
-msgid "Site Setup and Configuration"
-msgstr ""
-
-#: ../../include/nav.php:247
-msgid "@name, #tag, ?doc, content"
-msgstr ""
-
-#: ../../include/nav.php:248
-msgid "Please wait..."
-msgstr ""
-
-#: ../../include/network.php:647
+#: ../../include/network.php:659
 msgid "view full size"
 msgstr ""
 
-#: ../../include/network.php:1857 ../../include/account.php:317
+#: ../../include/network.php:1875 ../../include/account.php:317
 #: ../../include/account.php:344 ../../include/account.php:404
 msgid "Administrator"
 msgstr ""
 
-#: ../../include/network.php:1871
+#: ../../include/network.php:1889
 msgid "No Subject"
 msgstr ""
 
@@ -2319,7 +2597,7 @@ msgid "Edited"
 msgstr ""
 
 #: ../../include/photo/photo_driver.php:722 ../../mod/photos.php:94
-#: ../../mod/photos.php:711 ../../mod/profile_photo.php:147
+#: ../../mod/photos.php:738 ../../mod/profile_photo.php:147
 #: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:327
 msgid "Profile Photos"
 msgstr ""
@@ -2346,7 +2624,7 @@ msgstr ""
 msgid "Required"
 msgstr ""
 
-#: ../../include/datetime.php:273 ../../boot.php:2410
+#: ../../include/datetime.php:273 ../../boot.php:2411
 msgid "never"
 msgstr ""
 
@@ -2572,15 +2850,6 @@ msgstr ""
 msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80 ../../include/widgets.php:446
-#: ../../include/identity.php:389 ../../include/identity.php:390
-#: ../../include/identity.php:397 ../../mod/connedit.php:591
-#: ../../mod/settings.php:349 ../../mod/settings.php:353
-#: ../../mod/settings.php:354 ../../mod/settings.php:357
-#: ../../mod/settings.php:368
-msgid "Friends"
-msgstr ""
-
 #: ../../include/profile_selectors.php:80
 msgid "Friends/Benefits"
 msgstr ""
@@ -2742,7 +3011,7 @@ msgstr ""
 
 #: ../../include/contact_selectors.php:81 ../../mod/id.php:15
 #: ../../mod/id.php:16 ../../mod/admin.php:989 ../../mod/admin.php:998
-#: ../../boot.php:1581
+#: ../../boot.php:1582
 msgid "Email"
 msgstr ""
 
@@ -2802,36 +3071,66 @@ msgstr ""
 msgid "dislikes"
 msgstr ""
 
-#: ../../include/photos.php:112
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/attach.php:247 ../../include/attach.php:333
+msgid "Item was not found."
 msgstr ""
 
-#: ../../include/photos.php:119
-msgid "Image file is empty."
+#: ../../include/attach.php:497
+msgid "No source file."
 msgstr ""
 
-#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
-#: ../../mod/cover_photo.php:164
-msgid "Unable to process image"
+#: ../../include/attach.php:519
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
+#: ../../include/attach.php:537
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/photos.php:297
-msgid "a new photo"
+#: ../../include/attach.php:672
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/photos.php:301
+#: ../../include/attach.php:686
 #, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/photos.php:510
-msgid "Upload New Photos"
+#: ../../include/attach.php:842
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr ""
+
+#: ../../include/attach.php:855
+msgid "Stored file could not be verified. Upload failed."
+msgstr ""
+
+#: ../../include/attach.php:909 ../../include/attach.php:925
+msgid "Path not available."
+msgstr ""
+
+#: ../../include/attach.php:971 ../../include/attach.php:1123
+msgid "Empty pathname"
+msgstr ""
+
+#: ../../include/attach.php:997
+msgid "duplicate filename or path"
+msgstr ""
+
+#: ../../include/attach.php:1019
+msgid "Path not found."
+msgstr ""
+
+#: ../../include/attach.php:1077
+msgid "mkdir failed."
+msgstr ""
+
+#: ../../include/attach.php:1081
+msgid "database storage failed."
+msgstr ""
+
+#: ../../include/attach.php:1129
+msgid "Empty path"
 msgstr ""
 
 #: ../../include/features.php:48
@@ -2912,6 +3211,14 @@ msgstr ""
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
+#: ../../include/features.php:59
+msgid "Access Controlled Chatrooms"
+msgstr ""
+
+#: ../../include/features.php:59
+msgid "Provide chatrooms and chat services with access control."
+msgstr ""
+
 #: ../../include/features.php:60
 msgid "Smart Birthdays"
 msgstr ""
@@ -2954,11 +3261,6 @@ msgid ""
 "(640px) photo thumbnails"
 msgstr ""
 
-#: ../../include/features.php:71 ../../include/widgets.php:581
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr ""
-
 #: ../../include/features.php:71
 msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
@@ -3018,10 +3320,6 @@ msgstr ""
 msgid "Enable management and selection of privacy groups"
 msgstr ""
 
-#: ../../include/features.php:84 ../../include/widgets.php:281
-msgid "Saved Searches"
-msgstr ""
-
 #: ../../include/features.php:84
 msgid "Save search terms for re-use"
 msgstr ""
@@ -3114,577 +3412,346 @@ msgstr ""
 msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/text.php:394
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:396
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:425
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:428
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:438
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:440
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:822
-msgid "No connections"
-msgstr ""
-
-#: ../../include/text.php:847
-#, php-format
-msgid "View all %s connections"
-msgstr ""
-
-#: ../../include/text.php:905 ../../include/text.php:917
-#: ../../include/widgets.php:201 ../../mod/filer.php:49
-#: ../../mod/admin.php:1687 ../../mod/admin.php:1707 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:100
-msgid "Save"
-msgstr ""
-
-#: ../../include/text.php:992 ../../include/text.php:997
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:998
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:998
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:999
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:999
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:1000
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:1000
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:1001
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:1001
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:1002
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:1002
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:1014
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:1015
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:1016
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:1017
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:1018
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:1019
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "stupefied"
-msgstr ""
-
-#: ../../include/text.php:1021
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:1022
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:1023
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:1024
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:1025
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:1026
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:1027
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:1028
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:1029
-msgid "disturbed"
+#: ../../include/identity.php:32
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/text.php:1030
-msgid "frustrated"
+#: ../../include/identity.php:66
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/text.php:1031
-msgid "depressed"
+#: ../../include/identity.php:69
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/text.php:1032
-msgid "motivated"
+#: ../../include/identity.php:180
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/text.php:1033
-msgid "relaxed"
+#: ../../include/identity.php:192
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/text.php:1034
-msgid "surprised"
+#: ../../include/identity.php:206
+msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: ../../include/text.php:1210
-msgid "May"
+#: ../../include/identity.php:211
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/text.php:1287 ../../include/text.php:1291
-msgid "Unknown Attachment"
+#: ../../include/identity.php:287
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/text.php:1293
-msgid "unknown"
+#: ../../include/identity.php:345
+msgid "Default Profile"
 msgstr ""
 
-#: ../../include/text.php:1329
-msgid "remove category"
+#: ../../include/identity.php:784
+msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/text.php:1406
-msgid "remove from file"
+#: ../../include/identity.php:830 ../../mod/achievements.php:11
+#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
+#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
+#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
+#: ../../mod/profile.php:16 ../../mod/webpages.php:29
+msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/text.php:1548 ../../include/text.php:1559
-msgid "Click to open/close"
+#: ../../include/identity.php:924 ../../mod/profiles.php:691
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/text.php:1743 ../../mod/events.php:630 ../../mod/cal.php:302
-msgid "Link to Source"
+#: ../../include/identity.php:932
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/text.php:1764 ../../include/text.php:1836
-msgid "default"
+#: ../../include/identity.php:949 ../../mod/profiles.php:766
+msgid "Profile Image"
 msgstr ""
 
-#: ../../include/text.php:1772
-msgid "Page layout"
+#: ../../include/identity.php:952
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/text.php:1772
-msgid "You can create your own with the layouts tool"
+#: ../../include/identity.php:953 ../../mod/profiles.php:689
+#: ../../mod/profiles.php:770
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/text.php:1814
-msgid "Page content type"
+#: ../../include/identity.php:1027 ../../include/identity.php:1282
+msgid "Gender:"
 msgstr ""
 
-#: ../../include/text.php:1848
-msgid "Select an alternate language"
+#: ../../include/identity.php:1028 ../../include/identity.php:1326
+msgid "Status:"
 msgstr ""
 
-#: ../../include/text.php:1980
-msgid "activity"
+#: ../../include/identity.php:1029 ../../include/identity.php:1337
+msgid "Homepage:"
 msgstr ""
 
-#: ../../include/text.php:2275
-msgid "Design Tools"
+#: ../../include/identity.php:1030
+msgid "Online Now"
 msgstr ""
 
-#: ../../include/text.php:2278 ../../mod/blocks.php:147
-msgid "Blocks"
+#: ../../include/identity.php:1117 ../../include/identity.php:1193
+#: ../../mod/ping.php:318
+msgid "g A l F d"
 msgstr ""
 
-#: ../../include/text.php:2279 ../../mod/menu.php:103
-msgid "Menus"
+#: ../../include/identity.php:1118 ../../include/identity.php:1194
+msgid "F d"
 msgstr ""
 
-#: ../../include/text.php:2280 ../../mod/layouts.php:174
-msgid "Layouts"
+#: ../../include/identity.php:1163 ../../include/identity.php:1233
+#: ../../mod/ping.php:341
+msgid "[today]"
 msgstr ""
 
-#: ../../include/text.php:2281
-msgid "Pages"
+#: ../../include/identity.php:1174
+msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/zot.php:680
-msgid "Invalid data packet"
+#: ../../include/identity.php:1175
+msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/zot.php:696
-msgid "Unable to verify channel signature"
+#: ../../include/identity.php:1226
+msgid "[No description]"
 msgstr ""
 
-#: ../../include/zot.php:2332
-#, php-format
-msgid "Unable to verify site signature for %s"
+#: ../../include/identity.php:1244
+msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/zot.php:3667
-msgid "invalid target signature"
+#: ../../include/identity.php:1245
+msgid "Events this week:"
 msgstr ""
 
-#: ../../include/widgets.php:103
-msgid "System"
+#: ../../include/identity.php:1280 ../../mod/settings.php:1047
+msgid "Full Name:"
 msgstr ""
 
-#: ../../include/widgets.php:106
-msgid "Create Personal App"
+#: ../../include/identity.php:1287
+msgid "Like this channel"
 msgstr ""
 
-#: ../../include/widgets.php:107
-msgid "Edit Personal App"
+#: ../../include/identity.php:1311
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/widgets.php:149 ../../mod/suggest.php:54
-msgid "Ignore/Hide"
+#: ../../include/identity.php:1312
+msgid "j F"
 msgstr ""
 
-#: ../../include/widgets.php:154
-msgid "Suggestions"
+#: ../../include/identity.php:1319
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/widgets.php:155
-msgid "See more..."
+#: ../../include/identity.php:1323 ../../mod/directory.php:302
+msgid "Age:"
 msgstr ""
 
-#: ../../include/widgets.php:175
+#: ../../include/identity.php:1332
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr ""
-
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
-msgstr ""
-
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
-msgstr ""
-
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr ""
-
-#: ../../include/widgets.php:199
-msgid "Notes"
-msgstr ""
-
-#: ../../include/widgets.php:273
-msgid "Remove term"
-msgstr ""
-
-#: ../../include/widgets.php:282 ../../include/group.php:316
-msgid "add"
-msgstr ""
-
-#: ../../include/widgets.php:354
-msgid "Archives"
-msgstr ""
-
-#: ../../include/widgets.php:444 ../../mod/connedit.php:589
-msgid "Me"
-msgstr ""
-
-#: ../../include/widgets.php:445 ../../mod/connedit.php:590
-msgid "Family"
-msgstr ""
-
-#: ../../include/widgets.php:447 ../../mod/connedit.php:592
-msgid "Acquaintances"
-msgstr ""
-
-#: ../../include/widgets.php:448 ../../mod/connections.php:88
-#: ../../mod/connections.php:103 ../../mod/connedit.php:593
-msgid "All"
-msgstr ""
-
-#: ../../include/widgets.php:467
-msgid "Refresh"
-msgstr ""
-
-#: ../../include/widgets.php:507
-msgid "Account settings"
-msgstr ""
-
-#: ../../include/widgets.php:513
-msgid "Channel settings"
-msgstr ""
-
-#: ../../include/widgets.php:522
-msgid "Additional features"
-msgstr ""
-
-#: ../../include/widgets.php:529
-msgid "Feature/Addon settings"
-msgstr ""
-
-#: ../../include/widgets.php:535
-msgid "Display settings"
-msgstr ""
-
-#: ../../include/widgets.php:542
-msgid "Manage locations"
-msgstr ""
-
-#: ../../include/widgets.php:551
-msgid "Export channel"
-msgstr ""
-
-#: ../../include/widgets.php:558
-msgid "Connected apps"
-msgstr ""
-
-#: ../../include/widgets.php:565 ../../mod/connedit.php:701
-msgid "Connection Default Permissions"
-msgstr ""
-
-#: ../../include/widgets.php:573
-msgid "Premium Channel Settings"
-msgstr ""
-
-#: ../../include/widgets.php:602
-msgid "Private Mail Menu"
-msgstr ""
-
-#: ../../include/widgets.php:604
-msgid "Combined View"
-msgstr ""
-
-#: ../../include/widgets.php:636 ../../include/widgets.php:648
-msgid "Conversations"
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/widgets.php:640
-msgid "Received Messages"
+#: ../../include/identity.php:1335
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/widgets.php:644
-msgid "Sent Messages"
+#: ../../include/identity.php:1339 ../../mod/directory.php:318
+msgid "Hometown:"
 msgstr ""
 
-#: ../../include/widgets.php:658
-msgid "No messages."
+#: ../../include/identity.php:1341
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/widgets.php:676
-msgid "Delete conversation"
+#: ../../include/identity.php:1343
+msgid "Political Views:"
 msgstr ""
 
-#: ../../include/widgets.php:702
-msgid "Events Menu"
+#: ../../include/identity.php:1345
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/widgets.php:703
-msgid "Day View"
+#: ../../include/identity.php:1347 ../../mod/directory.php:320
+msgid "About:"
 msgstr ""
 
-#: ../../include/widgets.php:704
-msgid "Week View"
+#: ../../include/identity.php:1349
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/widgets.php:705
-msgid "Month View"
+#: ../../include/identity.php:1351
+msgid "Likes:"
 msgstr ""
 
-#: ../../include/widgets.php:706 ../../mod/events.php:661
-#: ../../mod/cal.php:328
-msgid "Export"
+#: ../../include/identity.php:1353
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/widgets.php:707 ../../mod/events.php:664
-#: ../../mod/cal.php:331
-msgid "Import"
+#: ../../include/identity.php:1355
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/widgets.php:717
-msgid "Events Tools"
+#: ../../include/identity.php:1357
+msgid "My other channels:"
 msgstr ""
 
-#: ../../include/widgets.php:718
-msgid "Export Calendar"
+#: ../../include/identity.php:1359
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/widgets.php:719
-msgid "Import Calendar"
+#: ../../include/identity.php:1361
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/widgets.php:793
-msgid "Chat Rooms"
+#: ../../include/identity.php:1363
+msgid "Television:"
 msgstr ""
 
-#: ../../include/widgets.php:797
-msgid "Overview"
+#: ../../include/identity.php:1365
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/widgets.php:804
-msgid "Chat Members"
+#: ../../include/identity.php:1367
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/widgets.php:823
-msgid "Bookmarked Chatrooms"
+#: ../../include/identity.php:1369
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/widgets.php:843
-msgid "Suggested Chatrooms"
+#: ../../include/identity.php:1371
+msgid "School/education:"
 msgstr ""
 
-#: ../../include/widgets.php:988 ../../include/widgets.php:1100
-msgid "photo/image"
+#: ../../include/identity.php:1391
+msgid "Like this thing"
 msgstr ""
 
-#: ../../include/widgets.php:1043
-msgid "Click to show more"
+#: ../../include/identity.php:1801 ../../mod/cover_photo.php:236
+msgid "cover photo"
 msgstr ""
 
-#: ../../include/widgets.php:1194
-msgid "Rating Tools"
+#: ../../include/import.php:23
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/widgets.php:1198 ../../include/widgets.php:1200
-msgid "Rate Me"
+#: ../../include/import.php:70
+msgid "Channel clone failed. Import failed."
 msgstr ""
 
-#: ../../include/widgets.php:1203
-msgid "View Ratings"
+#: ../../include/import.php:80 ../../mod/import.php:146
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../include/widgets.php:1214 ../../mod/pubsites.php:18
-msgid "Public Hubs"
+#: ../../include/items.php:423 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/group.php:68
+#: ../../mod/import_items.php:108 ../../mod/like.php:280
+#: ../../mod/profperm.php:23 ../../mod/subthread.php:58 ../../index.php:184
+msgid "Permission denied"
 msgstr ""
 
-#: ../../include/widgets.php:1260
-msgid "Forums"
+#: ../../include/items.php:1138 ../../include/items.php:1183
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/widgets.php:1289
-msgid "Tasks"
+#: ../../include/items.php:1382
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/widgets.php:1298
-msgid "Documentation"
+#: ../../include/items.php:1384
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/widgets.php:1300
-msgid "Project/Site Information"
+#: ../../include/items.php:1386
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/widgets.php:1301
-msgid "For Members"
+#: ../../include/items.php:1388
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/widgets.php:1302
-msgid "For Administrators"
+#: ../../include/items.php:1390
+#, php-format
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/widgets.php:1303
-msgid "For Developers"
+#: ../../include/items.php:1392
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/widgets.php:1326 ../../mod/admin.php:456
-msgid "Site"
+#: ../../include/items.php:1394
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/widgets.php:1327
-msgid "Accounts"
+#: ../../include/items.php:1396
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/widgets.php:1327 ../../include/widgets.php:1365
-msgid "Member registrations waiting for confirmation"
+#: ../../include/items.php:4592 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/admin.php:141
+#: ../../mod/admin.php:1189 ../../mod/admin.php:1434 ../../mod/thing.php:85
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
 msgstr ""
 
-#: ../../include/widgets.php:1328 ../../mod/admin.php:1149
-msgid "Channels"
+#: ../../include/items.php:5126 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Privacy group not found."
 msgstr ""
 
-#: ../../include/widgets.php:1329 ../../mod/admin.php:710
-msgid "Security"
+#: ../../include/items.php:5142
+msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/widgets.php:1331 ../../mod/admin.php:1264
-#: ../../mod/admin.php:1325
-msgid "Plugins"
+#: ../../include/items.php:5149
+#, php-format
+msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/widgets.php:1332 ../../mod/admin.php:1486
-#: ../../mod/admin.php:1520
-msgid "Themes"
+#: ../../include/items.php:5159 ../../mod/connedit.php:701
+#, php-format
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/widgets.php:1333
-msgid "Inspect queue"
+#: ../../include/items.php:5161
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/widgets.php:1334 ../../mod/admin.php:1760
-msgid "Profile Fields"
+#: ../../include/items.php:5587 ../../mod/cover_photo.php:229
+msgid "female"
 msgstr ""
 
-#: ../../include/widgets.php:1335
-msgid "DB updates"
+#: ../../include/items.php:5588 ../../mod/cover_photo.php:230
+#, php-format
+msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../include/widgets.php:1353 ../../include/widgets.php:1363
-#: ../../mod/admin.php:1605
-msgid "Logs"
+#: ../../include/items.php:5589 ../../mod/cover_photo.php:231
+msgid "male"
 msgstr ""
 
-#: ../../include/widgets.php:1361
-msgid "Plugin Features"
+#: ../../include/items.php:5590 ../../mod/cover_photo.php:232
+#, php-format
+msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../include/widgets.php:1443 ../../mod/photos.php:760
-#: ../../mod/photos.php:1301
-msgid "View Photo"
+#: ../../include/items.php:5592 ../../mod/cover_photo.php:234
+#, php-format
+msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../include/widgets.php:1460 ../../mod/photos.php:791
-msgid "Edit Album"
+#: ../../include/items.php:5594
+msgid "profile photo"
 msgstr ""
 
 #: ../../include/group.php:26
@@ -3718,333 +3785,269 @@ msgstr ""
 msgid "Channels not in any privacy group"
 msgstr ""
 
-#: ../../include/items.php:423 ../../mod/dreport.php:6
-#: ../../mod/dreport.php:45 ../../mod/group.php:68
-#: ../../mod/import_items.php:108 ../../mod/like.php:280
-#: ../../mod/profperm.php:23 ../../mod/subthread.php:58 ../../index.php:184
-msgid "Permission denied"
-msgstr ""
-
-#: ../../include/items.php:1138 ../../include/items.php:1183
-msgid "(Unknown)"
-msgstr ""
-
-#: ../../include/items.php:1382
-msgid "Visible to anybody on the internet."
-msgstr ""
-
-#: ../../include/items.php:1384
-msgid "Visible to you only."
-msgstr ""
-
-#: ../../include/items.php:1386
-msgid "Visible to anybody in this network."
-msgstr ""
-
-#: ../../include/items.php:1388
-msgid "Visible to anybody authenticated."
-msgstr ""
-
-#: ../../include/items.php:1390
+#: ../../include/photos.php:112
 #, php-format
-msgid "Visible to anybody on %s."
-msgstr ""
-
-#: ../../include/items.php:1392
-msgid "Visible to all connections."
-msgstr ""
-
-#: ../../include/items.php:1394
-msgid "Visible to approved connections."
-msgstr ""
-
-#: ../../include/items.php:1396
-msgid "Visible to specific connections."
-msgstr ""
-
-#: ../../include/items.php:4588 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/admin.php:141
-#: ../../mod/admin.php:1189 ../../mod/admin.php:1434 ../../mod/thing.php:85
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
-msgstr ""
-
-#: ../../include/items.php:5122 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Privacy group not found."
-msgstr ""
-
-#: ../../include/items.php:5138
-msgid "Privacy group is empty."
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/items.php:5145
-#, php-format
-msgid "Privacy group: %s"
+#: ../../include/photos.php:119
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/items.php:5155 ../../mod/connedit.php:701
-#, php-format
-msgid "Connection: %s"
+#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
+#: ../../mod/cover_photo.php:164
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../include/items.php:5157
-msgid "Connection not found."
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/items.php:5583 ../../mod/cover_photo.php:229
-msgid "female"
+#: ../../include/photos.php:297
+msgid "a new photo"
 msgstr ""
 
-#: ../../include/items.php:5584 ../../mod/cover_photo.php:230
+#: ../../include/photos.php:301
 #, php-format
-msgid "%1$s updated her %2$s"
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
-#: ../../include/items.php:5585 ../../mod/cover_photo.php:231
-msgid "male"
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/items.php:5586 ../../mod/cover_photo.php:232
-#, php-format
-msgid "%1$s updated his %2$s"
+#: ../../include/text.php:394
+msgid "prev"
 msgstr ""
 
-#: ../../include/items.php:5588 ../../mod/cover_photo.php:234
-#, php-format
-msgid "%1$s updated their %2$s"
+#: ../../include/text.php:396
+msgid "first"
 msgstr ""
 
-#: ../../include/items.php:5590
-msgid "profile photo"
+#: ../../include/text.php:425
+msgid "last"
 msgstr ""
 
-#: ../../include/identity.php:32
-msgid "Unable to obtain identity information from database"
+#: ../../include/text.php:428
+msgid "next"
 msgstr ""
 
-#: ../../include/identity.php:66
-msgid "Empty name"
+#: ../../include/text.php:438
+msgid "older"
 msgstr ""
 
-#: ../../include/identity.php:69
-msgid "Name too long"
+#: ../../include/text.php:440
+msgid "newer"
 msgstr ""
 
-#: ../../include/identity.php:180
-msgid "No account identifier"
+#: ../../include/text.php:822
+msgid "No connections"
 msgstr ""
 
-#: ../../include/identity.php:192
-msgid "Nickname is required."
+#: ../../include/text.php:847
+#, php-format
+msgid "View all %s connections"
 msgstr ""
 
-#: ../../include/identity.php:206
-msgid "Reserved nickname. Please choose another."
+#: ../../include/text.php:992 ../../include/text.php:997
+msgid "poke"
 msgstr ""
 
-#: ../../include/identity.php:211
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
+#: ../../include/text.php:998
+msgid "ping"
 msgstr ""
 
-#: ../../include/identity.php:287
-msgid "Unable to retrieve created identity"
+#: ../../include/text.php:998
+msgid "pinged"
 msgstr ""
 
-#: ../../include/identity.php:345
-msgid "Default Profile"
+#: ../../include/text.php:999
+msgid "prod"
 msgstr ""
 
-#: ../../include/identity.php:783
-msgid "Requested channel is not available."
+#: ../../include/text.php:999
+msgid "prodded"
 msgstr ""
 
-#: ../../include/identity.php:829 ../../mod/achievements.php:11
-#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
-#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
-#: ../../mod/profile.php:16 ../../mod/webpages.php:29
-msgid "Requested profile is not available."
+#: ../../include/text.php:1000
+msgid "slap"
 msgstr ""
 
-#: ../../include/identity.php:923 ../../mod/profiles.php:691
-msgid "Change profile photo"
+#: ../../include/text.php:1000
+msgid "slapped"
 msgstr ""
 
-#: ../../include/identity.php:931
-msgid "Create New Profile"
+#: ../../include/text.php:1001
+msgid "finger"
 msgstr ""
 
-#: ../../include/identity.php:948 ../../mod/profiles.php:766
-msgid "Profile Image"
+#: ../../include/text.php:1001
+msgid "fingered"
 msgstr ""
 
-#: ../../include/identity.php:951
-msgid "Visible to everybody"
+#: ../../include/text.php:1002
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/identity.php:952 ../../mod/profiles.php:689
-#: ../../mod/profiles.php:770
-msgid "Edit visibility"
+#: ../../include/text.php:1002
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/identity.php:1026 ../../include/identity.php:1281
-msgid "Gender:"
+#: ../../include/text.php:1014
+msgid "happy"
 msgstr ""
 
-#: ../../include/identity.php:1027 ../../include/identity.php:1325
-msgid "Status:"
+#: ../../include/text.php:1015
+msgid "sad"
 msgstr ""
 
-#: ../../include/identity.php:1028 ../../include/identity.php:1336
-msgid "Homepage:"
+#: ../../include/text.php:1016
+msgid "mellow"
 msgstr ""
 
-#: ../../include/identity.php:1029
-msgid "Online Now"
+#: ../../include/text.php:1017
+msgid "tired"
 msgstr ""
 
-#: ../../include/identity.php:1116 ../../include/identity.php:1192
-#: ../../mod/ping.php:318
-msgid "g A l F d"
+#: ../../include/text.php:1018
+msgid "perky"
 msgstr ""
 
-#: ../../include/identity.php:1117 ../../include/identity.php:1193
-msgid "F d"
+#: ../../include/text.php:1019
+msgid "angry"
 msgstr ""
 
-#: ../../include/identity.php:1162 ../../include/identity.php:1232
-#: ../../mod/ping.php:341
-msgid "[today]"
+#: ../../include/text.php:1020
+msgid "stupefied"
 msgstr ""
 
-#: ../../include/identity.php:1173
-msgid "Birthday Reminders"
+#: ../../include/text.php:1021
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/identity.php:1174
-msgid "Birthdays this week:"
+#: ../../include/text.php:1022
+msgid "interested"
 msgstr ""
 
-#: ../../include/identity.php:1225
-msgid "[No description]"
+#: ../../include/text.php:1023
+msgid "bitter"
 msgstr ""
 
-#: ../../include/identity.php:1243
-msgid "Event Reminders"
+#: ../../include/text.php:1024
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/identity.php:1244
-msgid "Events this week:"
+#: ../../include/text.php:1025
+msgid "alive"
 msgstr ""
 
-#: ../../include/identity.php:1279 ../../mod/settings.php:1047
-msgid "Full Name:"
+#: ../../include/text.php:1026
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/identity.php:1286
-msgid "Like this channel"
+#: ../../include/text.php:1027
+msgid "anxious"
 msgstr ""
 
-#: ../../include/identity.php:1310
-msgid "j F, Y"
+#: ../../include/text.php:1028
+msgid "cranky"
 msgstr ""
 
-#: ../../include/identity.php:1311
-msgid "j F"
+#: ../../include/text.php:1029
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/identity.php:1318
-msgid "Birthday:"
+#: ../../include/text.php:1030
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/identity.php:1322 ../../mod/directory.php:302
-msgid "Age:"
+#: ../../include/text.php:1031
+msgid "depressed"
 msgstr ""
 
-#: ../../include/identity.php:1331
-#, php-format
-msgid "for %1$d %2$s"
+#: ../../include/text.php:1032
+msgid "motivated"
 msgstr ""
 
-#: ../../include/identity.php:1334
-msgid "Sexual Preference:"
+#: ../../include/text.php:1033
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/identity.php:1338 ../../mod/directory.php:318
-msgid "Hometown:"
+#: ../../include/text.php:1034
+msgid "surprised"
 msgstr ""
 
-#: ../../include/identity.php:1340
-msgid "Tags:"
+#: ../../include/text.php:1210
+msgid "May"
 msgstr ""
 
-#: ../../include/identity.php:1342
-msgid "Political Views:"
+#: ../../include/text.php:1287 ../../include/text.php:1291
+msgid "Unknown Attachment"
 msgstr ""
 
-#: ../../include/identity.php:1344
-msgid "Religion:"
+#: ../../include/text.php:1293
+msgid "unknown"
 msgstr ""
 
-#: ../../include/identity.php:1346 ../../mod/directory.php:320
-msgid "About:"
+#: ../../include/text.php:1329
+msgid "remove category"
 msgstr ""
 
-#: ../../include/identity.php:1348
-msgid "Hobbies/Interests:"
+#: ../../include/text.php:1406
+msgid "remove from file"
 msgstr ""
 
-#: ../../include/identity.php:1350
-msgid "Likes:"
+#: ../../include/text.php:1548 ../../include/text.php:1559
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/identity.php:1352
-msgid "Dislikes:"
+#: ../../include/text.php:1743 ../../mod/events.php:630 ../../mod/cal.php:302
+msgid "Link to Source"
 msgstr ""
 
-#: ../../include/identity.php:1354
-msgid "Contact information and Social Networks:"
+#: ../../include/text.php:1764 ../../include/text.php:1836
+msgid "default"
 msgstr ""
 
-#: ../../include/identity.php:1356
-msgid "My other channels:"
+#: ../../include/text.php:1772
+msgid "Page layout"
 msgstr ""
 
-#: ../../include/identity.php:1358
-msgid "Musical interests:"
+#: ../../include/text.php:1772
+msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/identity.php:1360
-msgid "Books, literature:"
+#: ../../include/text.php:1814
+msgid "Page content type"
 msgstr ""
 
-#: ../../include/identity.php:1362
-msgid "Television:"
+#: ../../include/text.php:1848
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/identity.php:1364
-msgid "Film/dance/culture/entertainment:"
+#: ../../include/text.php:1980
+msgid "activity"
 msgstr ""
 
-#: ../../include/identity.php:1366
-msgid "Love/Romance:"
+#: ../../include/text.php:2275
+msgid "Design Tools"
 msgstr ""
 
-#: ../../include/identity.php:1368
-msgid "Work/employment:"
+#: ../../include/text.php:2278 ../../mod/blocks.php:147
+msgid "Blocks"
 msgstr ""
 
-#: ../../include/identity.php:1370
-msgid "School/education:"
+#: ../../include/text.php:2279 ../../mod/menu.php:103
+msgid "Menus"
 msgstr ""
 
-#: ../../include/identity.php:1390
-msgid "Like this thing"
+#: ../../include/text.php:2280 ../../mod/layouts.php:174
+msgid "Layouts"
 msgstr ""
 
-#: ../../include/identity.php:1800 ../../mod/cover_photo.php:236
-msgid "cover photo"
+#: ../../include/text.php:2281
+msgid "Pages"
 msgstr ""
 
 #: ../../include/message.php:20
@@ -4297,9 +4300,9 @@ msgstr ""
 msgid "Other networks and post services"
 msgstr ""
 
-#: ../../include/acl_selectors.php:251 ../../mod/chat.php:223
-#: ../../mod/filestorage.php:147 ../../mod/photos.php:639
-#: ../../mod/photos.php:1013 ../../mod/thing.php:309 ../../mod/thing.php:355
+#: ../../include/acl_selectors.php:251 ../../mod/chat.php:229
+#: ../../mod/filestorage.php:147 ../../mod/photos.php:666
+#: ../../mod/photos.php:1040 ../../mod/thing.php:309 ../../mod/thing.php:355
 msgid "Permissions"
 msgstr ""
 
@@ -4495,31 +4498,43 @@ msgstr ""
 msgid "Bookmark this room"
 msgstr ""
 
-#: ../../mod/chat.php:220
+#: ../../mod/chat.php:212
+msgid "Feature disabled."
+msgstr ""
+
+#: ../../mod/chat.php:226
 msgid "New Chatroom"
 msgstr ""
 
-#: ../../mod/chat.php:221
+#: ../../mod/chat.php:227
 msgid "Chatroom name"
 msgstr ""
 
-#: ../../mod/chat.php:222
+#: ../../mod/chat.php:228
 msgid "Expiration of chats (minutes)"
 msgstr ""
 
-#: ../../mod/chat.php:234
+#: ../../mod/chat.php:240
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: ../../mod/chat.php:239
+#: ../../mod/chat.php:245
 msgid "No chatrooms available"
 msgstr ""
 
-#: ../../mod/chat.php:240 ../../mod/manage.php:137 ../../mod/profiles.php:777
+#: ../../mod/chat.php:246 ../../mod/manage.php:137 ../../mod/profiles.php:777
 msgid "Create New"
 msgstr ""
 
+#: ../../mod/chat.php:249
+msgid "Expiration"
+msgstr ""
+
+#: ../../mod/chat.php:250
+msgid "min"
+msgstr ""
+
 #: ../../mod/chatsvc.php:111
 msgid "Away"
 msgstr ""
@@ -4952,7 +4967,7 @@ msgid "$Projectname channel"
 msgstr ""
 
 #: ../../mod/directory.php:59 ../../mod/display.php:13
-#: ../../mod/photos.php:490 ../../mod/ratings.php:82 ../../mod/search.php:13
+#: ../../mod/photos.php:517 ../../mod/ratings.php:82 ../../mod/search.php:13
 #: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr ""
@@ -5289,12 +5304,12 @@ msgstr ""
 msgid "Create Event"
 msgstr ""
 
-#: ../../mod/events.php:659 ../../mod/events.php:666 ../../mod/photos.php:917
+#: ../../mod/events.php:659 ../../mod/events.php:666 ../../mod/photos.php:944
 #: ../../mod/cal.php:326 ../../mod/cal.php:333
 msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:660 ../../mod/events.php:667 ../../mod/photos.php:926
+#: ../../mod/events.php:660 ../../mod/events.php:667 ../../mod/photos.php:953
 #: ../../mod/setup.php:291 ../../mod/cal.php:327 ../../mod/cal.php:334
 msgid "Next"
 msgstr ""
@@ -5436,15 +5451,15 @@ msgstr ""
 msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../mod/help.php:149
+#: ../../mod/help.php:163
 msgid "Documentation Search"
 msgstr ""
 
-#: ../../mod/help.php:190 ../../mod/help.php:196 ../../mod/help.php:202
+#: ../../mod/help.php:204 ../../mod/help.php:210 ../../mod/help.php:216
 msgid "Help:"
 msgstr ""
 
-#: ../../mod/help.php:243
+#: ../../mod/help.php:257
 msgid "$Projectname Documentation"
 msgstr ""
 
@@ -6398,7 +6413,7 @@ msgstr ""
 msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../mod/photos.php:100
+#: ../../mod/photos.php:100 ../../mod/photos.php:144
 msgid "Album not found."
 msgstr ""
 
@@ -6406,147 +6421,154 @@ msgstr ""
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:171 ../../mod/photos.php:1021
+#: ../../mod/photos.php:148
+msgid ""
+"Multiple storage folders exist with this album name, but within different "
+"directories. Please remove the desired folder or folders using the Files "
+"manager"
+msgstr ""
+
+#: ../../mod/photos.php:205 ../../mod/photos.php:1048
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:501
+#: ../../mod/photos.php:528
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:550
+#: ../../mod/photos.php:577
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:589
+#: ../../mod/photos.php:616
 #, php-format
 msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../mod/photos.php:592
+#: ../../mod/photos.php:619
 #, php-format
 msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../mod/photos.php:628
+#: ../../mod/photos.php:655
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:632
+#: ../../mod/photos.php:659
 msgid "Enter an album name"
 msgstr ""
 
-#: ../../mod/photos.php:633
+#: ../../mod/photos.php:660
 msgid "or select an existing album (doubleclick)"
 msgstr ""
 
-#: ../../mod/photos.php:634
+#: ../../mod/photos.php:661
 msgid "Create a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:635
+#: ../../mod/photos.php:662
 msgid "Caption (optional):"
 msgstr ""
 
-#: ../../mod/photos.php:636
+#: ../../mod/photos.php:663
 msgid "Description (optional):"
 msgstr ""
 
-#: ../../mod/photos.php:663
+#: ../../mod/photos.php:690
 msgid "Album name could not be decoded"
 msgstr ""
 
-#: ../../mod/photos.php:711 ../../mod/photos.php:1251
-#: ../../mod/photos.php:1268
+#: ../../mod/photos.php:738 ../../mod/photos.php:1278
+#: ../../mod/photos.php:1295
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:734
+#: ../../mod/photos.php:761
 msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/photos.php:736
+#: ../../mod/photos.php:763
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/photos.php:838
+#: ../../mod/photos.php:865
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:840
+#: ../../mod/photos.php:867
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:898
+#: ../../mod/photos.php:925
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:899
+#: ../../mod/photos.php:926
 msgid "Use as cover photo"
 msgstr ""
 
-#: ../../mod/photos.php:906
+#: ../../mod/photos.php:933
 msgid "Private Photo"
 msgstr ""
 
-#: ../../mod/photos.php:921
+#: ../../mod/photos.php:948
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:966 ../../mod/tagrm.php:133
+#: ../../mod/photos.php:993 ../../mod/tagrm.php:133
 msgid "Remove"
 msgstr ""
 
-#: ../../mod/photos.php:1000
+#: ../../mod/photos.php:1027
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1002
+#: ../../mod/photos.php:1029
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:1003
+#: ../../mod/photos.php:1030
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:1006
+#: ../../mod/photos.php:1033
 msgid "Enter a new album name"
 msgstr ""
 
-#: ../../mod/photos.php:1007
+#: ../../mod/photos.php:1034
 msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: ../../mod/photos.php:1010
+#: ../../mod/photos.php:1037
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1012
+#: ../../mod/photos.php:1039
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1016
+#: ../../mod/photos.php:1043
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 
-#: ../../mod/photos.php:1019
+#: ../../mod/photos.php:1046
 msgid "Flag as adult in album view"
 msgstr ""
 
-#: ../../mod/photos.php:1211
+#: ../../mod/photos.php:1238
 msgid "In This Photo:"
 msgstr ""
 
-#: ../../mod/photos.php:1216
+#: ../../mod/photos.php:1243
 msgid "Map"
 msgstr ""
 
-#: ../../mod/photos.php:1307
+#: ../../mod/photos.php:1334
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1318 ../../mod/photos.php:1331
-#: ../../mod/photos.php:1332
+#: ../../mod/photos.php:1345 ../../mod/photos.php:1358
+#: ../../mod/photos.php:1359
 msgid "Recent Photos"
 msgstr ""
 
@@ -9052,7 +9074,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1587
+#: ../../mod/lostpass.php:86 ../../boot.php:1588
 msgid "Password Reset"
 msgstr ""
 
@@ -9562,51 +9584,51 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1387
+#: ../../boot.php:1388
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1390
+#: ../../boot.php:1391
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1560
+#: ../../boot.php:1561
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr ""
 
-#: ../../boot.php:1582
+#: ../../boot.php:1583
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1583
+#: ../../boot.php:1584
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1586
+#: ../../boot.php:1587
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2216
+#: ../../boot.php:2217
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2369
+#: ../../boot.php:2370
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2372
+#: ../../boot.php:2373
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2409
+#: ../../boot.php:2410
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2413
+#: ../../boot.php:2414
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
diff --git a/version.inc b/version.inc
index 275e0cd49..32652d931 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-04-07.1359H
+2016-04-08.1360H
author	redmatrix <git@macgirvin.com>	2016-04-08 03:32:28 -0700
committer	redmatrix <git@macgirvin.com>	2016-04-08 03:32:28 -0700
commit	2db59f3b7697d141e6dda0aa85f9161bfee32a2a (patch)
tree	e2c93efd8dc534a5450286dbfef8eb784af46bd0
parent	279f32b13deb45f3fe0ab2d32f6d2a0ea6e224e5 (diff)
parent	44e21f619801ceceac32fee33b5915b437628dfa (diff)
download	volse-hubzilla-2db59f3b7697d141e6dda0aa85f9161bfee32a2a.tar.gz volse-hubzilla-2db59f3b7697d141e6dda0aa85f9161bfee32a2a.tar.bz2 volse-hubzilla-2db59f3b7697d141e6dda0aa85f9161bfee32a2a.zip