diff options
| author | Guy Brand <gb@unistra.fr> | 2014-05-05 22:51:26 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2014-05-05 22:51:26 +0200 |
| commit | 43a2e077a27740ebb0f0bc49e4a3d288c8811d78 (patch) | |
| tree | e22f94855951702e622d4c40ac44f3031b3d5819 /lib/plugins/usermanager/lang/en | |
| parent | c6af9e94ed5d7f7713359faac18543db9a9aee48 (diff) | |
| parent | 75930869ddcb31470ea7617eddfb882de02645df (diff) | |
| download | rpg-43a2e077a27740ebb0f0bc49e4a3d288c8811d78.tar.gz rpg-43a2e077a27740ebb0f0bc49e4a3d288c8811d78.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'lib/plugins/usermanager/lang/en')
| -rw-r--r-- | lib/plugins/usermanager/lang/en/import.txt | 2 | ||||
| -rw-r--r-- | lib/plugins/usermanager/lang/en/lang.php | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/plugins/usermanager/lang/en/import.txt b/lib/plugins/usermanager/lang/en/import.txt index 2087083e0..360a0689b 100644 --- a/lib/plugins/usermanager/lang/en/import.txt +++ b/lib/plugins/usermanager/lang/en/import.txt @@ -2,7 +2,7 @@ Requires a CSV file of users with at least four columns. The columns must contain, in order: user-id, full name, email address and groups. -The CSV fields should be separated by commas (,) and strings delimited by quotation marks (""). Backslash (\) can be used for escaping. +The CSV fields should be separated by commas (,) and strings delimited by quotation marks (%%""%%). Backslash (\) can be used for escaping. For an example of a suitable file, try the "Export Users" function above. Duplicate user-ids will be ignored. diff --git a/lib/plugins/usermanager/lang/en/lang.php b/lib/plugins/usermanager/lang/en/lang.php index f87c77afb..b55ecc998 100644 --- a/lib/plugins/usermanager/lang/en/lang.php +++ b/lib/plugins/usermanager/lang/en/lang.php @@ -76,4 +76,3 @@ $lang['import_error_create'] = 'Unable to create the user'; $lang['import_notify_fail'] = 'Notification message could not be sent for imported user, %s with email %s.'; $lang['import_downloadfailures'] = 'Download Failures as CSV for correction'; - |