diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-09-21 19:39:22 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-09-21 19:39:22 +0200 |
| commit | c6bab40722735490d4687c8ade8081f389913249 (patch) | |
| tree | 61090c1dfeafe80fd11a5035f6be38a68c2d62ed /inc/lang/en | |
| parent | 32bb4dd2402ee999e6bc7be7e6fa1dd5c58049b1 (diff) | |
| parent | bc314c5832351325feac48564dae39a93321d99a (diff) | |
| download | rpg-c6bab40722735490d4687c8ade8081f389913249.tar.gz rpg-c6bab40722735490d4687c8ade8081f389913249.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Conflicts:
lib/tpl/default/mediamanager.css
Diffstat (limited to 'inc/lang/en')
| -rw-r--r-- | inc/lang/en/lang.php | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index f082c1655..92c7185b2 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -334,18 +334,22 @@ $lang['wordblock'] = 'Your change was not saved because it contains $lang['media_uploadtab'] = 'Upload'; $lang['media_searchtab'] = 'Search'; +$lang['media_file'] = 'File'; $lang['media_viewtab'] = 'View'; $lang['media_edittab'] = 'Edit'; $lang['media_historytab'] = 'History'; -$lang['media_thumbsview'] = 'Thumbnails'; -$lang['media_listview'] = 'List'; -$lang['media_sort'] = 'Sort'; -$lang['media_sort_name'] = 'by name'; -$lang['media_sort_date'] = 'by date'; -$lang['media_upload'] = 'Upload to the <strong>%s</strong> namespace.'; -$lang['media_search'] = 'Search in the <strong>%s</strong> namespace.'; -$lang['media_edit'] = 'Edit'; -$lang['media_history'] = 'These are the older revisions of the file.'; +$lang['media_list_thumbs'] = 'Thumbnails'; +$lang['media_list_rows'] = 'Rows'; +$lang['media_sort_name'] = 'Name'; +$lang['media_sort_date'] = 'Date'; +$lang['media_namespaces'] = 'Choose namespace'; +$lang['media_files'] = 'Files in %s'; +$lang['media_upload'] = 'Upload to %s'; +$lang['media_search'] = 'Search in %s'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s at %s'; +$lang['media_edit'] = 'Edit %s'; +$lang['media_history'] = 'History of %s'; $lang['media_meta_edited'] = 'metadata edited'; $lang['media_perm_read'] = 'Sorry, you don\'t have enough rights to read files.'; $lang['media_perm_upload'] = 'Sorry, you don\'t have enough rights to upload files.'; @@ -354,4 +358,4 @@ $lang['media_restore'] = 'Restore this version'; $lang['plugin_install_err'] = "Plugin installed incorrectly. Rename plugin directory '%s' to '%s'."; -//Setup VIM: ex: et ts=2 :
\ No newline at end of file +//Setup VIM: ex: et ts=2 : |