Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 2 insertions, 0 deletions

diff --git a/include/js_strings.php b/include/js_strings.php
index 56ffa9536..cae8da5de 100644
--- a/include/js_strings.php
+++ b/include/js_strings.php
@@ -20,6 +20,8 @@ function js_strings() {
 		'$rating_val'  => t('Rating'),
 		'$rating_text' => t('Describe (optional)'),
 		'$submit'      => t('Submit'),
+		'$linkurl'     => t('Please enter a link URL'),
+		'$leavethispage' => t('Unsaved changes. Are you sure you wish to leave this page?'),
 
 		'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : ''),
 		'$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : ''),