Merge branch 'master' into trinidad

2015-01-04 00:48:18 -08:00
parent 8d590068e9 9433a0ddc8
commit edd1ad37c4
12 changed files with 6482 additions and 6428 deletions
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -147,7 +147,9 @@ function filestorage_content(&$a) {
 			'$isadir' => $is_a_dir,
 			'$cpdesc' => t('Copy/paste this code to attach file to a post'),
 			'$cpldesc' => t('Copy/paste this URL to link file from a web page'),
-			'$submit' => t('Submit')
+			'$submit' => t('Submit'),
+			'$attach_btn_title' => t('Attach this file to a new post'),
+			'$link_btn_title' => t('Show URL to this file'),
 		));

 		echo $o;