diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2002-09-18 04:38:17 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2002-09-18 04:38:17 +0000 |
| commit | 13307c1360721ee1892ae5eb1e7d9d27ec6c3c76 (patch) | |
| tree | 68a7a68dfca08fdf053c133389cd1dbacf80f95a /phpBB/language | |
| parent | 66e0b322202c62644c29a198307d62f9eac12e53 (diff) | |
| download | forums-13307c1360721ee1892ae5eb1e7d9d27ec6c3c76.tar forums-13307c1360721ee1892ae5eb1e7d9d27ec6c3c76.tar.gz forums-13307c1360721ee1892ae5eb1e7d9d27ec6c3c76.tar.bz2 forums-13307c1360721ee1892ae5eb1e7d9d27ec6c3c76.tar.xz forums-13307c1360721ee1892ae5eb1e7d9d27ec6c3c76.zip | |
New smilies admin, a bug fixed in mysql.php and a left join removed from admin_forums.php
git-svn-id: file:///svn/phpbb/trunk@2891 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/lang_english/lang_admin.php | 59 |
1 files changed, 34 insertions, 25 deletions
diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php index a5a742101d..f3250be0da 100644 --- a/phpBB/language/lang_english/lang_admin.php +++ b/phpBB/language/lang_english/lang_admin.php @@ -576,34 +576,43 @@ $lang['Click_return_forumadmin'] = 'Click %sHere%s to return to Forum Administra // // Smiley Management // -$lang['Emoticons_explain'] = 'From this page you can add, remove and edit the emoticons or smileys your users may use in their posts and private messages.'; - -$lang['smiley_config'] = 'Smiley Configuration'; -$lang['smiley_code'] = 'Smiley Code'; -$lang['smiley_url'] = 'Smiley Image File'; -$lang['smiley_emot'] = 'Smiley Emotion'; -$lang['smile_add'] = 'Add a new Smiley'; +$lang['Emoticons_explain'] = 'From this page you can add, remove and edit the emoticons or smilies users can use in their posts and private messages.'; + +$lang['Import_smilies'] = 'Import smilies pak'; +$lang['Import_smilies_explain'] = 'Unzip the smilies package to your smilies directory then select the correct information in this form to import it.'; + +$lang['Smilies_import'] = 'Smilies pack import'; +$lang['No_smilies_pak'] = 'No smilies pack found'; +$lang['Select_package'] = 'Select a package file'; +$lang['Delete_existing_smilies'] = 'Delete existing smilies before import'; +$lang['Smilies_conflicts'] = 'What should be done in case of conflicts?'; +$lang['Keep_existing_smilies'] = 'Keep existing smilies'; +$lang['Replace_existing_smilies'] = 'Replace existing smilies'; +$lang['Smilies_import_success'] = 'The smilies pack was imported successfully'; + +$lang['Export_smilies'] = 'Create smilies pak'; +$lang['Export_smilies_explain'] = 'To create a package of your currently installed smilies, %sclick here%s to download the smilies.pak file. Name this file appropriately, making sure to keep the .pak file extension then create a zip file containing all of your smilies images plus this .pak configuration file.'; + +$lang['Add_smile'] = 'Add a new smile'; +$lang['Edit_smile'] = 'Edit smile'; + +$lang['Smile_config'] = 'Smile configuration'; +$lang['Smile_code'] = 'Smile code'; +$lang['Smile_url'] = 'Smile image file'; +$lang['Smile_height'] = 'Smile height'; +$lang['Smile_width'] = 'Smile width'; +$lang['Smile_emotion'] = 'Smile emotion'; +$lang['Smile_add'] = 'Add a new smile'; +$lang['Smile_edit'] = 'Edit smile'; $lang['Smile'] = 'Smile'; $lang['Emotion'] = 'Emotion'; -$lang['Select_pak'] = 'Select Pack (.pak) File'; -$lang['replace_existing'] = 'Replace Existing Smiley'; -$lang['keep_existing'] = 'Keep Existing Smiley'; -$lang['smiley_import_inst'] = 'You should unzip the smiley package and upload all files to the appropriate Smiley directory for your installation. Then select the correct information in this form to import the smiley pack.'; -$lang['smiley_import'] = 'Smiley Pack Import'; -$lang['choose_smile_pak'] = 'Choose a Smile Pack .pak file'; -$lang['import'] = 'Import Smileys'; -$lang['smile_conflicts'] = 'What should be done in case of conflicts'; -$lang['del_existing_smileys'] = 'Delete existing smileys before import'; -$lang['import_smile_pack'] = 'Import Smiley Pack'; -$lang['export_smile_pack'] = 'Create Smiley Pack'; -$lang['export_smiles'] = 'To create a smiley pack from your currently installed smileys, click %sHere%s to download the smiles.pak file. Name this file appropriately making sure to keep the .pak file extension. Then create a zip file containing all of your smiley images plus this .pak configuration file.'; - -$lang['smiley_add_success'] = 'The Smiley was successfully added'; -$lang['smiley_edit_success'] = 'The Smiley was successfully updated'; -$lang['smiley_import_success'] = 'The Smiley Pack was imported successfully!'; -$lang['smiley_del_success'] = 'The Smiley was successfully removed'; -$lang['Click_return_smileadmin'] = 'Click %sHere%s to return to Smiley Administration'; +$lang['Smile_deleted'] = 'This smile has been successfully removed'; +$lang['Smile_edited'] = 'This smile has been successfully updated'; +$lang['Smile_added'] = 'This smile has been successfully added'; +$lang['Smilies_imported'] = 'The smilies pack has been successfully imported'; + +$lang['Click_return_smileadmin'] = 'Click %sHere%s to return to Smilies Administration'; // |