Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 13 insertions, 0 deletions

diff --git a/mod/river_privacy/languages/en.php b/mod/river_privacy/languages/en.php
new file mode 100644
index 000000000..f0cfde2a1
--- /dev/null
+++ b/mod/river_privacy/languages/en.php
@@ -0,0 +1,13 @@
+<?php
+
+$english = array(
+	'river_privacy' => "River Privacy",
+	'river_privacy:hide_old:description' => "Only items that are created after this plugin is enabled
+	will be set to private.  This setting can allow old items to be hidden - this is done at
+	display time, so it may affect layout (eg. 20 items are expected to be shown, but only 15 are
+	visible because 5 of them are filtered out by this plugin).
+	Note that new items created will be private regardless of this setting, this setting is only for old items.",
+	'river_privacy:hide_old:label' => "Hide old river entries?",  
+);
+					
+add_translation("en",$english);