Merge remote-tracking branch 'friendica/master'

2012-01-06 09:11:48 +01:00 · 2012-01-06 09:11:48 +01:00 · f9b0af6f2f
commit f9b0af6f2f
parent efe308b5ac c3ada095f4
12 changed files with 146 additions and 17 deletions
--- a/mod/photos.php
+++ b/mod/photos.php
@ -1203,6 +1203,7 @@ function photos_content(&$a) {
 							'$myphoto' => $contact['thumb'],
 							'$comment' => t('Comment'),
 							'$submit' => t('Submit'),
+							'$preview' => t('Preview'),
 							'$ww' => ''
 						));
 					}