Stash changes to merge from dev

2016-07-16 21:02:13 -04:00
parent ff2f599142
commit e7b8531751
3 changed files with 52 additions and 30 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -2271,10 +2271,9 @@ function website_import_tools() {
 		'$import_placeholder' => t('Select folder to import'),
 		'$file_upload_text' => t('Import from a zipped folder:'),
 		'$file_import_text' => t('Import from cloud files:'),
-		'$file_remote_text' => t('Import from another channel'),
-		'$desc' => t('https://example.com/cloud/peter/sharedfolder'),
-		'$hint' => t('https://example.com/cloud/peter/sharedfolder'),
-		'$follow' => t('Import'),
+		'$desc' => t('/path/to/folder'),
+		'$hint' => t('/path/to/folder'),
+		'$select' => t('Select folder'),
 	));
 }