consistency of event form

4 files changed, 198 insertions, 213 deletions

diff --git a/mod/events.php b/mod/events.php
index 7fc4b26f2..9c94d433d 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -490,7 +490,7 @@ function events_content(&$a) {
 			'$export'   => array($a->get_baseurl()."/events/$y/$m/export",t('Export'),'',''),
 			'$calendar' => cal($y,$m,$links, ' eventcal'),			
 			'$events'	=> $events,
-			'$upload'   => t('Upload'),
+			'$upload'   => t('Import'),
 			'$submit'   => t('Submit')			
 		));
 		
diff --git a/util/messages.po b/util/messages.po
index 6db106a2c..d645321f7 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-07-24.1103\n"
+"Project-Id-Version: 2015-07-31.1110\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-24 00:04-0700\n"
+"POT-Creation-Date: 2015-07-31 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"
@@ -40,47 +40,6 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: ../../include/diaspora.php:2114 ../../include/text.php:1888
-#: ../../include/conversation.php:120 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:43
-msgid "photo"
-msgstr ""
-
-#: ../../include/diaspora.php:2114 ../../include/text.php:1894
-#: ../../include/conversation.php:148 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-msgid "status"
-msgstr ""
-
-#: ../../include/diaspora.php:2143 ../../include/conversation.php:164
-#: ../../mod/like.php:394
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
-
-#: ../../include/diaspora.php:2489
-msgid "Please choose"
-msgstr ""
-
-#: ../../include/diaspora.php:2491
-msgid "Agree"
-msgstr ""
-
-#: ../../include/diaspora.php:2493
-msgid "Disagree"
-msgstr ""
-
-#: ../../include/diaspora.php:2495
-msgid "Abstain"
-msgstr ""
-
-#: ../../include/diaspora.php:2517 ../../include/diaspora.php:2528
-#: ../../include/network.php:1586 ../../include/enotify.php:59
-#: ../../mod/p.php:46
-msgid "$projectname"
-msgstr ""
-
 #: ../../include/contact_selectors.php:56
 msgid "Frequently"
 msgstr ""
@@ -292,7 +251,7 @@ msgstr ""
 msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:235 ../../mod/events.php:635
+#: ../../include/datetime.php:235 ../../mod/events.php:649
 #: ../../mod/appman.php:91 ../../mod/appman.php:92
 msgid "Required"
 msgstr ""
@@ -392,7 +351,7 @@ msgstr ""
 #: ../../mod/menu.php:147 ../../mod/filestorage.php:151
 #: ../../mod/filestorage.php:159 ../../mod/admin.php:428
 #: ../../mod/settings.php:579 ../../mod/removeme.php:60
-#: ../../mod/connedit.php:631 ../../mod/connedit.php:659
+#: ../../mod/connedit.php:635 ../../mod/connedit.php:663
 #: ../../view/theme/redbasic/php/config.php:104
 #: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555
 msgid "No"
@@ -429,7 +388,7 @@ msgstr ""
 
 #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
 #: ../../include/conversation.php:1155 ../../mod/webpages.php:188
-#: ../../mod/events.php:653 ../../mod/editpost.php:143
+#: ../../mod/events.php:667 ../../mod/editpost.php:143
 #: ../../mod/photos.php:982 ../../mod/editwebpage.php:214
 #: ../../mod/editblock.php:170
 msgid "Preview"
@@ -466,28 +425,6 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: ../../include/event.php:19 ../../include/bb2diaspora.php:459
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:465
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/event.php:37 ../../include/bb2diaspora.php:473
-msgid "Finishes:"
-msgstr ""
-
-#: ../../include/event.php:47 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:908 ../../mod/directory.php:302
-#: ../../mod/events.php:647
-msgid "Location:"
-msgstr ""
-
-#: ../../include/event.php:391
-msgid "This event has been added to your calendar."
-msgstr ""
-
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr ""
@@ -550,7 +487,7 @@ msgid "Rate This Channel (this is public)"
 msgstr ""
 
 #: ../../include/js_strings.php:20 ../../mod/rate.php:156
-#: ../../mod/connedit.php:667
+#: ../../mod/connedit.php:671
 msgid "Rating"
 msgstr ""
 
@@ -560,22 +497,23 @@ msgstr ""
 
 #: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
 #: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:275
-#: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81
-#: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941
-#: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58
-#: ../../mod/import.php:534 ../../mod/chat.php:177 ../../mod/chat.php:211
-#: ../../mod/mitem.php:232 ../../mod/rate.php:167 ../../mod/invite.php:142
-#: ../../mod/locs.php:105 ../../mod/sources.php:104 ../../mod/sources.php:138
-#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
-#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/setup.php:327
-#: ../../mod/setup.php:367 ../../mod/admin.php:453 ../../mod/admin.php:819
-#: ../../mod/admin.php:986 ../../mod/admin.php:1118 ../../mod/admin.php:1312
-#: ../../mod/admin.php:1397 ../../mod/settings.php:588
-#: ../../mod/settings.php:692 ../../mod/settings.php:718
-#: ../../mod/settings.php:746 ../../mod/settings.php:769
-#: ../../mod/settings.php:854 ../../mod/settings.php:1050
-#: ../../mod/mood.php:134 ../../mod/connedit.php:688 ../../mod/mail.php:355
-#: ../../mod/appman.php:99 ../../mod/pconfig.php:108 ../../mod/poll.php:68
+#: ../../mod/thing.php:318 ../../mod/events.php:494 ../../mod/events.php:670
+#: ../../mod/group.php:81 ../../mod/photos.php:577 ../../mod/photos.php:654
+#: ../../mod/photos.php:941 ../../mod/photos.php:981 ../../mod/photos.php:1099
+#: ../../mod/pdledit.php:58 ../../mod/import.php:534 ../../mod/chat.php:177
+#: ../../mod/chat.php:211 ../../mod/mitem.php:232 ../../mod/rate.php:167
+#: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/filestorage.php:156
+#: ../../mod/fsuggest.php:108 ../../mod/poke.php:166
+#: ../../mod/profiles.php:667 ../../mod/setup.php:327 ../../mod/setup.php:367
+#: ../../mod/admin.php:453 ../../mod/admin.php:819 ../../mod/admin.php:986
+#: ../../mod/admin.php:1118 ../../mod/admin.php:1312 ../../mod/admin.php:1397
+#: ../../mod/settings.php:588 ../../mod/settings.php:692
+#: ../../mod/settings.php:718 ../../mod/settings.php:746
+#: ../../mod/settings.php:769 ../../mod/settings.php:854
+#: ../../mod/settings.php:1050 ../../mod/mood.php:134
+#: ../../mod/connedit.php:692 ../../mod/mail.php:355 ../../mod/appman.php:99
+#: ../../mod/pconfig.php:108 ../../mod/poll.php:68
 #: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
@@ -942,7 +880,7 @@ msgstr ""
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1665 ../../mod/events.php:443
+#: ../../include/text.php:1665 ../../mod/events.php:457
 msgid "Link to Source"
 msgstr ""
 
@@ -966,11 +904,24 @@ msgstr ""
 msgid "Select an alternate language"
 msgstr ""
 
+#: ../../include/text.php:1888 ../../include/diaspora.php:2119
+#: ../../include/conversation.php:120 ../../mod/like.php:346
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:43
+msgid "photo"
+msgstr ""
+
 #: ../../include/text.php:1891 ../../include/conversation.php:123
 #: ../../mod/like.php:348 ../../mod/tagger.php:47
 msgid "event"
 msgstr ""
 
+#: ../../include/text.php:1894 ../../include/diaspora.php:2119
+#: ../../include/conversation.php:148 ../../mod/like.php:346
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+msgid "status"
+msgstr ""
+
 #: ../../include/text.php:1896 ../../include/conversation.php:150
 #: ../../mod/tagger.php:53
 msgid "comment"
@@ -1068,7 +1019,7 @@ msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:257
 #: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362
-#: ../../mod/photos.php:718 ../../mod/photos.php:1248
+#: ../../mod/events.php:493 ../../mod/photos.php:718 ../../mod/photos.php:1248
 msgid "Upload"
 msgstr ""
 
@@ -1096,7 +1047,7 @@ msgstr ""
 #: ../../mod/blocks.php:155 ../../mod/photos.php:1062
 #: ../../mod/editlayout.php:178 ../../mod/editwebpage.php:225
 #: ../../mod/editblock.php:180 ../../mod/admin.php:826 ../../mod/admin.php:988
-#: ../../mod/settings.php:651 ../../mod/connedit.php:547
+#: ../../mod/settings.php:651 ../../mod/connedit.php:551
 msgid "Delete"
 msgstr ""
 
@@ -1121,6 +1072,12 @@ msgstr ""
 msgid "$Projectname Notification"
 msgstr ""
 
+#: ../../include/network.php:1586 ../../include/enotify.php:59
+#: ../../include/diaspora.php:2522 ../../include/diaspora.php:2533
+#: ../../mod/p.php:46
+msgid "$projectname"
+msgstr ""
+
 #: ../../include/network.php:1588 ../../include/enotify.php:61
 msgid "Thank You,"
 msgstr ""
@@ -1468,11 +1425,11 @@ msgstr ""
 msgid "Archives"
 msgstr ""
 
-#: ../../include/widgets.php:429 ../../mod/connedit.php:567
+#: ../../include/widgets.php:429 ../../mod/connedit.php:571
 msgid "Me"
 msgstr ""
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:568
+#: ../../include/widgets.php:430 ../../mod/connedit.php:572
 msgid "Family"
 msgstr ""
 
@@ -1481,16 +1438,16 @@ msgstr ""
 #: ../../include/profile_selectors.php:80 ../../mod/settings.php:345
 #: ../../mod/settings.php:349 ../../mod/settings.php:350
 #: ../../mod/settings.php:353 ../../mod/settings.php:364
-#: ../../mod/connedit.php:569
+#: ../../mod/connedit.php:573
 msgid "Friends"
 msgstr ""
 
-#: ../../include/widgets.php:432 ../../mod/connedit.php:570
+#: ../../include/widgets.php:432 ../../mod/connedit.php:574
 msgid "Acquaintances"
 msgstr ""
 
 #: ../../include/widgets.php:433 ../../mod/connections.php:231
-#: ../../mod/connections.php:246 ../../mod/connedit.php:571
+#: ../../mod/connections.php:246 ../../mod/connedit.php:575
 msgid "All"
 msgstr ""
 
@@ -1526,7 +1483,7 @@ msgstr ""
 msgid "Export channel"
 msgstr ""
 
-#: ../../include/widgets.php:532 ../../mod/connedit.php:658
+#: ../../include/widgets.php:532 ../../mod/connedit.php:662
 msgid "Connection Default Permissions"
 msgstr ""
 
@@ -1581,6 +1538,28 @@ msgstr ""
 msgid "Public Hubs"
 msgstr ""
 
+#: ../../include/event.php:22 ../../include/bb2diaspora.php:459
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:465
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:473
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
+#: ../../include/identity.php:908 ../../mod/directory.php:302
+#: ../../mod/events.php:661
+msgid "Location:"
+msgstr ""
+
+#: ../../include/event.php:535
+msgid "This event has been added to your calendar."
+msgstr ""
+
 #: ../../include/enotify.php:96
 #, php-format
 msgid "%s <!item_type!>"
@@ -1775,6 +1754,28 @@ msgstr ""
 msgid "Stored post could not be verified."
 msgstr ""
 
+#: ../../include/diaspora.php:2148 ../../include/conversation.php:164
+#: ../../mod/like.php:394
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
+
+#: ../../include/diaspora.php:2494
+msgid "Please choose"
+msgstr ""
+
+#: ../../include/diaspora.php:2496
+msgid "Agree"
+msgstr ""
+
+#: ../../include/diaspora.php:2498
+msgid "Disagree"
+msgstr ""
+
+#: ../../include/diaspora.php:2500
+msgid "Abstain"
+msgstr ""
+
 #: ../../include/follow.php:28
 msgid "Channel is blocked on this site."
 msgstr ""
@@ -2280,7 +2281,7 @@ msgid "Outbox"
 msgstr ""
 
 #: ../../include/nav.php:202 ../../include/apps.php:140
-#: ../../mod/events.php:472
+#: ../../mod/events.php:486
 msgid "Events"
 msgstr ""
 
@@ -2850,13 +2851,13 @@ msgstr ""
 msgid "Set expiration date"
 msgstr ""
 
-#: ../../include/conversation.php:1238 ../../mod/events.php:637
+#: ../../include/conversation.php:1238 ../../mod/events.php:651
 #: ../../mod/editpost.php:153
 msgid "OK"
 msgstr ""
 
 #: ../../include/conversation.php:1239 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:134 ../../mod/events.php:636 ../../mod/fbrowser.php:82
+#: ../../mod/tagrm.php:134 ../../mod/events.php:650 ../../mod/fbrowser.php:82
 #: ../../mod/fbrowser.php:117 ../../mod/editpost.php:154
 #: ../../mod/settings.php:589 ../../mod/settings.php:615
 msgid "Cancel"
@@ -3036,14 +3037,14 @@ msgstr ""
 msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/items.php:4207 ../../mod/thing.php:74
+#: ../../include/items.php:4209 ../../mod/thing.php:74
 #: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
 #: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
 #: ../../mod/display.php:36
 msgid "Item not found."
 msgstr ""
 
-#: ../../include/items.php:4280 ../../include/attach.php:137
+#: ../../include/items.php:4282 ../../include/attach.php:137
 #: ../../include/attach.php:184 ../../include/attach.php:247
 #: ../../include/attach.php:261 ../../include/attach.php:305
 #: ../../include/attach.php:319 ../../include/attach.php:350
@@ -3055,7 +3056,7 @@ msgstr ""
 #: ../../mod/thing.php:256 ../../mod/thing.php:290
 #: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
 #: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
-#: ../../mod/events.php:218 ../../mod/group.php:9 ../../mod/item.php:206
+#: ../../mod/events.php:232 ../../mod/group.php:9 ../../mod/item.php:206
 #: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/network.php:12
 #: ../../mod/common.php:35 ../../mod/connections.php:169
 #: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/editpost.php:13
@@ -3086,26 +3087,26 @@ msgstr ""
 msgid "Permission denied."
 msgstr ""
 
-#: ../../include/items.php:4682 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4684 ../../mod/group.php:38 ../../mod/group.php:140
 #: ../../mod/bulksetclose.php:51
 msgid "Collection not found."
 msgstr ""
 
-#: ../../include/items.php:4698
+#: ../../include/items.php:4700
 msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/items.php:4705
+#: ../../include/items.php:4707
 #, php-format
 msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/items.php:4715 ../../mod/connedit.php:658
+#: ../../include/items.php:4717 ../../mod/connedit.php:662
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/items.php:4717
+#: ../../include/items.php:4719
 msgid "Connection not found."
 msgstr ""
 
@@ -3214,7 +3215,7 @@ msgstr ""
 msgid "Don't show"
 msgstr ""
 
-#: ../../include/acl_selectors.php:248 ../../mod/events.php:654
+#: ../../include/acl_selectors.php:248 ../../mod/events.php:668
 #: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209
 #: ../../mod/filestorage.php:147
 msgid "Permissions"
@@ -3988,7 +3989,7 @@ msgstr ""
 msgid "Homepage: "
 msgstr ""
 
-#: ../../mod/directory.php:308 ../../mod/events.php:645
+#: ../../mod/directory.php:308 ../../mod/events.php:659
 msgid "Description:"
 msgstr ""
 
@@ -4372,101 +4373,109 @@ msgstr ""
 msgid "Thank you."
 msgstr ""
 
-#: ../../mod/events.php:87
+#: ../../mod/events.php:21
+msgid "Calendar entries imported."
+msgstr ""
+
+#: ../../mod/events.php:23
+msgid "No calendar entries found."
+msgstr ""
+
+#: ../../mod/events.php:101
 msgid "Event can not end before it has started."
 msgstr ""
 
-#: ../../mod/events.php:89 ../../mod/events.php:98 ../../mod/events.php:116
+#: ../../mod/events.php:103 ../../mod/events.php:112 ../../mod/events.php:130
 msgid "Unable to generate preview."
 msgstr ""
 
-#: ../../mod/events.php:96
+#: ../../mod/events.php:110
 msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../mod/events.php:114
+#: ../../mod/events.php:128
 msgid "Event not found."
 msgstr ""
 
-#: ../../mod/events.php:395
+#: ../../mod/events.php:409
 msgid "l, F j"
 msgstr ""
 
-#: ../../mod/events.php:417
+#: ../../mod/events.php:431
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:418
+#: ../../mod/events.php:432
 msgid "Delete event"
 msgstr ""
 
-#: ../../mod/events.php:452
+#: ../../mod/events.php:466
 msgid "calendar"
 msgstr ""
 
-#: ../../mod/events.php:473
+#: ../../mod/events.php:487
 msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:474 ../../mod/photos.php:839
+#: ../../mod/events.php:488 ../../mod/photos.php:839
 msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:475 ../../mod/photos.php:848 ../../mod/setup.php:281
+#: ../../mod/events.php:489 ../../mod/photos.php:848 ../../mod/setup.php:281
 msgid "Next"
 msgstr ""
 
-#: ../../mod/events.php:476
+#: ../../mod/events.php:490
 msgid "Export"
 msgstr ""
 
-#: ../../mod/events.php:504
+#: ../../mod/events.php:518
 msgid "Event removed"
 msgstr ""
 
-#: ../../mod/events.php:507
+#: ../../mod/events.php:521
 msgid "Failed to remove event"
 msgstr ""
 
-#: ../../mod/events.php:627
+#: ../../mod/events.php:641
 msgid "Event details"
 msgstr ""
 
-#: ../../mod/events.php:628
+#: ../../mod/events.php:642
 msgid "Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/events.php:630
+#: ../../mod/events.php:644
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/events.php:632
+#: ../../mod/events.php:646
 msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/events.php:639
+#: ../../mod/events.php:653
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:641
+#: ../../mod/events.php:655
 msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/events.php:643 ../../mod/events.php:644
+#: ../../mod/events.php:657 ../../mod/events.php:658
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:643
+#: ../../mod/events.php:657
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr ""
 
-#: ../../mod/events.php:649
+#: ../../mod/events.php:663
 msgid "Title:"
 msgstr ""
 
-#: ../../mod/events.php:651
+#: ../../mod/events.php:665
 msgid "Share this event"
 msgstr ""
 
@@ -7107,7 +7116,7 @@ msgstr ""
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:824 ../../mod/connedit.php:683
+#: ../../mod/admin.php:824 ../../mod/connedit.php:687
 msgid "Approve"
 msgstr ""
 
@@ -8201,52 +8210,12 @@ msgstr ""
 msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../mod/connedit.php:401
-msgid "Channel has been unblocked"
-msgstr ""
-
-#: ../../mod/connedit.php:402
-msgid "Channel has been blocked"
-msgstr ""
-
 #: ../../mod/connedit.php:406 ../../mod/connedit.php:418
 #: ../../mod/connedit.php:430 ../../mod/connedit.php:442
 #: ../../mod/connedit.php:458
 msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../mod/connedit.php:413
-msgid "Channel has been unignored"
-msgstr ""
-
-#: ../../mod/connedit.php:414
-msgid "Channel has been ignored"
-msgstr ""
-
-#: ../../mod/connedit.php:425
-msgid "Channel has been unarchived"
-msgstr ""
-
-#: ../../mod/connedit.php:426
-msgid "Channel has been archived"
-msgstr ""
-
-#: ../../mod/connedit.php:437
-msgid "Channel has been unhidden"
-msgstr ""
-
-#: ../../mod/connedit.php:438
-msgid "Channel has been hidden"
-msgstr ""
-
-#: ../../mod/connedit.php:453
-msgid "Channel has been approved"
-msgstr ""
-
-#: ../../mod/connedit.php:454
-msgid "Channel has been unapproved"
-msgstr ""
-
 #: ../../mod/connedit.php:482
 msgid "Connection has been removed."
 msgstr ""
@@ -8276,164 +8245,180 @@ msgstr ""
 msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:526
+#: ../../mod/connedit.php:523
+msgid "This connection is blocked!"
+msgstr ""
+
+#: ../../mod/connedit.php:527
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/connedit.php:526 ../../mod/notifications.php:51
+#: ../../mod/connedit.php:527 ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr ""
 
-#: ../../mod/connedit.php:529
+#: ../../mod/connedit.php:530
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:533
+#: ../../mod/connedit.php:531
+msgid "This connection is ignored!"
+msgstr ""
+
+#: ../../mod/connedit.php:535
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/connedit.php:533
+#: ../../mod/connedit.php:535
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:538
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../mod/connedit.php:540
+#: ../../mod/connedit.php:539
+msgid "This connection is archived!"
+msgstr ""
+
+#: ../../mod/connedit.php:543
 msgid "Unhide"
 msgstr ""
 
-#: ../../mod/connedit.php:540
+#: ../../mod/connedit.php:543
 msgid "Hide"
 msgstr ""
 
-#: ../../mod/connedit.php:543
+#: ../../mod/connedit.php:546
 msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../mod/connedit.php:550
+#: ../../mod/connedit.php:547
+msgid "This connection is hidden!"
+msgstr ""
+
+#: ../../mod/connedit.php:554
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:635
 msgid "Approve this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:635
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../mod/connedit.php:636
+#: ../../mod/connedit.php:640
 msgid "Set Affinity"
 msgstr ""
 
-#: ../../mod/connedit.php:639
+#: ../../mod/connedit.php:643
 msgid "Set Profile"
 msgstr ""
 
-#: ../../mod/connedit.php:642
+#: ../../mod/connedit.php:646
 msgid "Set Affinity & Profile"
 msgstr ""
 
-#: ../../mod/connedit.php:659
+#: ../../mod/connedit.php:663
 msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../mod/connedit.php:661
+#: ../../mod/connedit.php:665
 msgid "This connection's address is"
 msgstr ""
 
-#: ../../mod/connedit.php:664
+#: ../../mod/connedit.php:668
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr ""
 
-#: ../../mod/connedit.php:666
+#: ../../mod/connedit.php:670
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../mod/connedit.php:668
+#: ../../mod/connedit.php:672
 msgid "Slide to adjust your rating"
 msgstr ""
 
-#: ../../mod/connedit.php:669 ../../mod/connedit.php:674
+#: ../../mod/connedit.php:673 ../../mod/connedit.php:678
 msgid "Optionally explain your rating"
 msgstr ""
 
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:675
 msgid "Custom Filter"
 msgstr ""
 
-#: ../../mod/connedit.php:672
+#: ../../mod/connedit.php:676
 msgid "Only import posts with this text"
 msgstr ""
 
-#: ../../mod/connedit.php:672 ../../mod/connedit.php:673
+#: ../../mod/connedit.php:676 ../../mod/connedit.php:677
 msgid ""
 "words one per line or #tags or /patterns/, leave blank to import all posts"
 msgstr ""
 
-#: ../../mod/connedit.php:673
+#: ../../mod/connedit.php:677
 msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../mod/connedit.php:675
+#: ../../mod/connedit.php:679
 msgid "This information is public!"
 msgstr ""
 
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:684
 msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:685
 msgid "Connection Request"
 msgstr ""
 
-#: ../../mod/connedit.php:682
+#: ../../mod/connedit.php:686
 #, php-format
 msgid ""
 "(%s) would like to connect with you. Please approve this connection to allow "
 "communication."
 msgstr ""
 
-#: ../../mod/connedit.php:684
+#: ../../mod/connedit.php:688
 msgid "Approve Later"
 msgstr ""
 
-#: ../../mod/connedit.php:687
+#: ../../mod/connedit.php:691
 msgid "inherited"
 msgstr ""
 
-#: ../../mod/connedit.php:689
+#: ../../mod/connedit.php:693
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:695
 msgid "Their Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:692
+#: ../../mod/connedit.php:696
 msgid "My Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:698
 msgid "Individual Permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:699
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
 "\"><strong>privacy settings</strong></a>, which have higher priority than "
 "individual settings. You can <strong>not</strong> change those settings here."
 msgstr ""
 
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:700
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
 "\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -8441,7 +8426,7 @@ msgid ""
 "any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../mod/connedit.php:697
+#: ../../mod/connedit.php:701
 msgid "Last update:"
 msgstr ""
 
diff --git a/version.inc b/version.inc
index 110ed7a67..c937dfd57 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-07-30.1109
+2015-07-31.1110
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index c91419783..bb6ca63a4 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -3,7 +3,7 @@
 <h2>{{$title}}</h2>
 
 <div class="pull-right">
-<button class="btn btn-xs" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button>&nbsp;<button class="btn btn-xs" onclick="exportDate(); return false;" >{{$export.1}}</button>&nbsp;<button class="btn btn-xs btn-success" onclick="openClose('event-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
+<button class="btn btn-xs" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button>&nbsp;<button class="btn btn-xs" onclick="exportDate(); return false;" ><i class="icon-download"></i>&nbsp;{{$export.1}}</button>&nbsp;<button class="btn btn-xs" onclick="openClose('event-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
 </div>
 
 <div id="event-upload-form" style="display:none;">