- first try to break things...

git-svn-id: file:///svn/phpbb/trunk@5108 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-07-30 21:40:43 +02:00 · 2005-03-21 22:43:07 +00:00
parent 68b7397da8
commit a4e51c9699
32 changed files with 260 additions and 235 deletions
--- a/phpBB/language/en/admin.php
+++ b/phpBB/language/en/admin.php
@@ -91,7 +91,7 @@ $lang += array(
 	'GROUP_PERMS'	=> 'Group permissions',

 	'POST_CAT'		=> 'Posting',
-	'SMILE'			=> 'Smilies',
+	'SMILIES'		=> 'Smilies',
 	'ICONS'			=> 'Icons',
 	'WORD_CENSOR'	=> 'Word Censors',

@@ -439,7 +439,7 @@ $lang += array(
 	'acl_a_cookies' 	=> 'Can alter cookie settings',
 	'acl_a_names' 		=> 'Can alter disallowed names',
 	'acl_a_words' 		=> 'Can alter word censors',
-	'acl_a_icons' 		=> 'Can alter topic icons and emoticons',
+	'acl_a_icons' 		=> 'Can alter topic icons and smilies',
 	'acl_a_search' 		=> 'Can re-index search tables',
 	'acl_a_prune' 		=> 'Can prune forums',
 	'acl_a_bbcode' 		=> 'Can define BBCode tags',
@@ -704,7 +704,7 @@ $lang += array(
 	'BROWSER_VALID_EXPLAIN'		=> 'Enables browser validation for each session inproving security.',
 	'ENABLE_GZIP'				=> 'Enable GZip Compression',
 	'SMILIES_PATH'				=> 'Smilies storage path',
-	'SMILIES_PATH_EXPLAIN'		=> 'Path under your phpBB root dir, e.g. images/smiles',
+	'SMILIES_PATH_EXPLAIN'		=> 'Path under your phpBB root dir, e.g. images/smilies',
 	'ICONS_PATH'				=> 'Post icons storage path',
 	'ICONS_PATH_EXPLAIN'		=> 'Path under your phpBB root dir, e.g. images/icons',
 	'UPLOAD_ICONS_PATH'			=> 'Extension group icons storage path',
@@ -1028,60 +1028,71 @@ $lang += array(
 // Smiley and topic icons
 $lang += array(
 	'ICONS_EXPLAIN'	=> 'From this page you can add, remove and edit the icons users may add to their topics or posts. These icons are generally displayed next to topic titles on the forum listing, or the post subjects in topic listings. You can also install and create new packages of icons.',
-	'SMILE_EXPLAIN' => 'Smilies or emoticons are typically small, sometimes animated images used to convey an emotion or feeling. From this page you can add, remove and edit the emoticons users can use in their posts and private messages. You can also install and create new packages of smilies.',
-	'IMPORT_SMILE'	=> 'Install smilies pak',
-	'EXPORT_SMILE'	=> 'Create smilies pak',
+	'SMILIES_EXPLAIN' => 'Smilies or emoticons are typically small, sometimes animated images used to convey an emotion or feeling. From this page you can add, remove and edit the emoticons users can use in their posts and private messages. You can also install and create new packages of smilies.',
+	'IMPORT_SMILIES'	=> 'Install smilies pak',
+	'EXPORT_SMILIES'	=> 'Create smilies pak',
 	'IMPORT_ICONS'	=> 'Install icons pak',
 	'EXPORT_ICONS'	=> 'Create icons pak',
-	'MASS_ADD_SMILE'=> 'Add multiple smilies',
-	'ADD_SMILE'		=> 'Add single smilie',
+	'MASS_ADD_SMILIES'=> 'Add multiple smilies',
+	'ADD_SMILIES'	=> 'Add single smiley',
 	'ADD_ICONS'		=> 'Add single icon',
 	'ADD_ICONS'		=> 'Add multiple icons',
-	'EDIT_SMILE'	=> 'Edit smilies',
+	'EDIT_SMILIES'	=> 'Edit smilies',
 	'EDIT_ICONS'	=> 'Edit Icons',
-	'SMILE_NOT_DISPLAYED' => 'The following smilies are not displayed on the posting page',
+	'SMILIES_NOT_DISPLAYED' => 'The following smilies are not displayed on the posting page',
 	'ICONS_NOT_DISPLAYED' => 'The following icons are not displayed on the posting page',
+	'CODE'			=> 'Code',
 	'EMOTION'		=> 'Emotion',
 	'REORDER'		=> 'Reorder',
 	'DISPLAY'		=> 'Display',
 	'DIMENSIONS'	=> 'Dimensions',
 	'FIRST'			=> 'First',
-	'AFTER_SMILE'	=> 'After %s',
+	'AFTER_SMILIES'	=> 'After %s',
 	'AFTER_ICONS'	=> 'After %s',
-	'SMILE_CONFIG'	=> 'Smilie configuration',
-	'SMILE_IMAGE'	=> 'Smilie image',
-	'SMILE_CODE'	=> 'Smilie code',
-	'SMILE_URL'		=> 'Smilie image file',
-	'SMILE_ORDER'	=> 'Smilie order',
-	'SMILE_EMOTION' => 'Emotion',
-	'SMILE_ADD'		=> 'Add a new Smilie',
-	'SMILE_EDIT'	=> 'Edit Smilie',
-	'SMILE_LOCATION'=> 'Smilie location',
-	'ICONS_CONFIG'	=> 'Icon configuration',
-	'ICONS_IMAGE'	=> 'Icon image',
-	'ICONS_ORDER'	=> 'Icon order',
-	'ICONS_LOCATION'=> 'Icon location',
-	'ICONS_ADD'		=> 'Add a new Icon',
-	'ICONS_EDIT'	=> 'Edit Icon',
-	'EXPORT_SMILE_EXPLAIN' => 'To create a package of your currently installed smilies, click %sHERE%s to download the emoticons.pak file. Once downloaded create a zip or tgz file containing all of your smilies plus this .pak configuration file.',
+
+	'SMILIES_CONFIG'	=> 'Smiley configuration',
+	'SMILIES_IMAGE'		=> 'Smiley image',
+	'SMILIES_CODE'		=> 'Smiley code',
+	'SMILIES_URL'		=> 'Smiley image file',
+	'SMILIES_ORDER'		=> 'Smiley order',
+	'SMILIES_EMOTION'	=> 'Emotion',
+	'SMILIES_ADD'		=> 'Add a new Smiley',
+	'SMILIES_EDIT'		=> 'Edit Smiley',
+	'SMILIES_LOCATION'	=> 'Smiley location',
+	'SMILIES_WIDTH'		=> 'Smiley width',
+	'SMILIES_HEIGHT'	=> 'Smiley height',
+
+	'ICONS_CONFIG'		=> 'Icon configuration',
+	'ICONS_IMAGE'		=> 'Icon image',
+	'ICONS_LOCATION'	=> 'Icon location',
+	'ICONS_URL'			=> 'Icon image file',
+	'ICONS_ORDER'		=> 'Icon order',
+	'ICONS_ADD'			=> 'Add a new Icon',
+	'ICONS_EDIT'		=> 'Edit Icon',
+	'ICONS_WIDTH'		=> 'Icon width',
+	'ICONS_HEIGHT'		=> 'Icon height',
+
+	'EXPORT_SMILIES_EXPLAIN' => 'To create a package of your currently installed smilies, click %sHERE%s to download the smilies.pak file. Once downloaded create a zip or tgz file containing all of your smilies plus this .pak configuration file.',
 	'EXPORT_ICONS_EXPLAIN' => 'To create a package of your currently installed icons, click %sHERE%s to download the icons package file. Once downloaded create a zip or tgz file containing all of your icons plus this .pak configuration file.',
-	'NO_SMILE_EXPORT'	=> 'You have no smilies with which to create a package.',
+	'NO_SMILIES_EXPORT'	=> 'You have no smilies with which to create a package.',
 	'NO_ICONS_EXPORT'	=> 'You have no icons with which to create a package.',
 	'WRONG_PAK_TYPE'	=> 'The specified package does not contain the appropriate data.',
 	'SELECT_PACKAGE'	=> 'Select a package file',
 	'DELETE_ALL'		=> 'Delete all',
 	'KEEP_ALL'			=> 'Keep all',
 	'REPLACE_MATCHES'	=> 'Replace matches',
-	'NO_SMILE_PAK'		=> 'No smilie packages found.',
-	'CURRENT_SMILE'		=> 'Current smilies',
-	'SMILE_IMPORT_SUCCESS' => 'The smilies pack was imported successfully',
+	'NO_SMILIES_PAK'	=> 'No smiley packages found.',
+	'CURRENT_SMILIES'	=> 'Current smilies',
+	'SMILIES_IMPORT_SUCCESS' => 'The smilies pack was imported successfully',
 	'NO_ICONS_PAK' => 'No icon packages found.',
 	'CURRENT_ICONS' => 'Current icons',
+	'DISPLAY_ON_POSTING'	=> 'Display on posting',
+	
 	'ICONS_IMPORT_SUCCESS' => 'The icons pack was imported successfully',
-	'SMILE_DELETED' => 'The smilie has been removed successfully.',
-	'SMILE_EDITED' => 'The smilie has been updated successfully.',
-	'SMILE_ADDED' => 'The smilie has been added successfully.',
-	'SMILE_IMPORTED' => 'The smilies pack has been installed successfully.',
+	'SMILIES_DELETED' => 'The smiley has been removed successfully.',
+	'SMILIES_EDITED' => 'The smiley has been updated successfully.',
+	'SMILIES_ADDED' => 'The smiley has been added successfully.',
+	'SMILIES_IMPORTED' => 'The smilies pack has been installed successfully.',
 	'ICONS_DELETED' => 'The icon has been removed successfully.',
 	'ICONS_EDITED' => 'The icon has been updated successfully.',
 	'ICONS_ADDED' => 'The icon has been added successfully.',
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -58,10 +58,15 @@ $lang += array(
 	'ASCENDING'				=> 'Ascending',
 	'ATTACHMENTS'			=> 'Attachments',
 	'AUTHOR'				=> 'Author',
+	'AVATAR_DISALLOWED_EXTENSION'	=> 'The Extension %s is not allowed',
+	'AVATAR_EMPTY_REMOTE_DATA'	=> 'Avatar could not be uploaded, please try uploading the file manually.',
+	'AVATAR_INVALID_FILENAME'	=> '%s is an invalid filename',
 	'AVATAR_NOT_UPLOADED'	=> 'Avatar could not be uploaded.',
 	'AVATAR_NO_SIZE'		=> 'Could not obtain width or height of linked avatar, please enter them manually.',
+	'AVATAR_PHP_SIZE_NA'	=> 'The avatar is too huge in filesize.<br />Could not determine the maximum size defined by PHP in php.ini.',
+	'AVATAR_PHP_SIZE_OVERRUN'	=> 'The avatar is too huge in filesize, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
 	'AVATAR_URL_INVALID'	=> 'The URL you specified is invalid.',
-	'AVATAR_WRONG_FILESIZE'	=> 'The avatar must be between 0 and %d bytes.',
+	'AVATAR_WRONG_FILESIZE'	=> 'The avatar must be between 0 and %1d %2s.',
 	'AVATAR_WRONG_SIZE'		=> 'The avatar must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high.',

 	'BACK_TO_TOP'			=> 'Top',
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -34,9 +34,6 @@ $lang += array(
 	'ADD_POLL'					=> 'Add Poll',
 	'ADD_POLL_EXPLAIN'			=> 'If you do not want to add a poll to your topic leave the fields blank',
 	'ALREADY_DELETED'			=> 'Sorry but this message is already deleted.',
-	'ATTACHMENT_PHP_SIZE_NA'	=> 'The attachment is too big.<br />Could not get determine the maximum size defined by PHP in php.ini.',
-	'ATTACHMENT_PHP_SIZE_OVERRUN'	=> 'The attachment is too big, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
-	'ATTACHMENT_TOO_BIG'		=> 'The attachment is too big, maximum allowed size is %1d %2s',
 	'ATTACH_QUOTA_REACHED'		=> 'Sorry, the board attachment quota has been reached.',
 	'ATTACH_SIG'				=> 'Attach a signature (signatures can be altered via the UCP)',

@@ -87,9 +84,9 @@ $lang += array(

 	'EDIT_POST'					=> 'Edit Post',
 	'EDIT_REASON'				=> 'Reason for editing this post',
-	'EMOTICONS'					=> 'Emoticons',
+	'SMILIES'					=> 'Smilies',
 	'EMPTY_MESSAGE'				=> 'You must enter a message when posting.',
-	'ERROR_IMAGESIZE'			=> 'The Image you tried to attach is too big, maximum allowed dimensions are %1d px X %2d px.',
+	'EMPTY_REMOTE_DATA'			=> 'File could not be uploaded, please try uploading the file manually.',

 	'FLASH_IS_OFF'				=> '[flash] is <u>OFF</u>',
 	'FLASH_IS_ON'				=> '[flash] is <u>ON</u>',
@@ -119,14 +116,17 @@ $lang += array(

 	'MESSAGE_BODY_EXPLAIN'		=> 'Enter your message here, it may contain no more than <b>%d</b> characters.',
 	'MESSAGE_DELETED'			=> 'Your message has been deleted successfully',
-	'MORE_EMOTICONS'			=> 'View more Emoticons',
+	'MORE_SMILIES'				=> 'View more smilies',

 	'NOTIFY_REPLY'				=> 'Send me an email when a reply is posted',
+	'NOT_UPLOADED'				=> 'File could not be uploaded.',
 	'NO_DELETE_POLL_OPTIONS'	=> 'You cannot delete existing poll options',
 	'NO_POLL_TITLE'				=> 'You have to enter a poll title',
 	'NO_POST'					=> 'The requested post does not exist.',
 	'NO_POST_MODE'				=> 'No post mode specified',

+	'PHP_SIZE_NA'				=> 'The attachment is too big.<br />Could not determine the maximum size defined by PHP in php.ini.',
+	'PHP_SIZE_OVERRUN'			=> 'The attachment is too big, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overriden.',
 	'PLACE_INLINE'				=> 'Place Inline',
 	'POLL_DELETE'				=> 'Delete Poll',
 	'POLL_FOR'					=> 'Run poll for',
@@ -169,7 +169,7 @@ $lang += array(
 	'TOO_MANY_ATTACHMENTS'		=> 'Cannot add another attachment, %d is the maxmimum.',
 	'TOO_MANY_CHARS'			=> 'Your message contains too many characters.',
 	'TOO_MANY_POLL_OPTIONS'		=> 'You have tried to enter too many poll options',
-	'TOO_MANY_SMILIES'			=> 'Your message contains too many emoticons. A maximum of %d emoticons are allowed.',
+	'TOO_MANY_SMILIES'			=> 'Your message contains too many smilies. A maximum of %d smilies are allowed.',
 	'TOO_MANY_URLS'				=> 'Your message contains too many urls. A maximum of %d urls are allowed.',
 	'TOO_MANY_USER_OPTIONS'		=> 'You cannot specify more Options per User than existing poll options',
 	'TOPIC_BUMPED'				=> 'Topic has been bumped successfully',
@@ -177,6 +177,7 @@ $lang += array(

 	'UNAUTHORISED_BBCODE'		=> 'You cannot use certain bbcodes: ',
 	'UPDATE_COMMENT'			=> 'Update comment',
+	'URL_INVALID'				=> 'The URL you specified is invalid.',
 	'USER_CANNOT_BUMP'			=> 'You cannot bump topics in this forum',
 	'USER_CANNOT_DELETE'		=> 'You cannot delete posts in this forum',
 	'USER_CANNOT_EDIT'			=> 'You cannot edit posts in this forum',
@@ -184,6 +185,9 @@ $lang += array(
 	'USER_CANNOT_REPLY'			=> 'You cannot reply in this forum',

 	'VIEW_MESSAGE'				=> 'Click %sHere%s to view your message',
+
+	'WRONG_FILESIZE'			=> 'The file is too big, maximum allowed size is %1d %2s',
+	'WRONG_SIZE'				=> 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high.',
 );

 ?>
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -99,7 +99,7 @@ $lang += array(
 	'DEFAULT_BBCODE'			=> 'Enable BBCode by default',
 	'DEFAULT_HTML'				=> 'Enable HTML by default',
 	'DEFAULT_NOTIFY'			=> 'Notify me upon replies by default',
-	'DEFAULT_SMILE'				=> 'Enable smilies by default',
+	'DEFAULT_SMILIES'			=> 'Enable smilies by default',
 	'DEFINED_RULES'				=> 'Defined Rules',
 	'DELETE_ALL'				=> 'Delete all',
 	'DELETE_ATTACHMENT'			=> 'Delete Attachment',
@@ -320,29 +320,35 @@ $lang += array(
 	'UCP_EMAIL_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. You will recieve an email at the address you provide that contains an account activation link.',
 	'UCP_ICQ'					=> 'ICQ Number',
 	'UCP_JABBER'				=> 'Jabber Address',
+
 	'UCP_MAIN'					=> 'Overview',
-	'UCP_BOOKMARKS'				=> 'Bookmarks',
-	'UCP_DRAFTS'				=> 'Saved drafts',
-	'UCP_FRONT'					=> 'Front page',
-	'UCP_SUBSCRIBED'			=> 'Subscribed',
+	'UCP_MAIN_BOOKMARKS'		=> 'Bookmarks',
+	'UCP_MAIN_DRAFTS'			=> 'Saved drafts',
+	'UCP_MAIN_FRONT'			=> 'Front page',
+	'UCP_MAIN_SUBSCRIBED'		=> 'Subscribed',
+
 	'UCP_MSNM'					=> 'MSN Messenger',
 	'UCP_NO_ATTACHMENTS'		=> 'You have posted no files',
+
 	'UCP_PREFS'					=> 'Preferences',
-	'UCP_PERSONAL'				=> 'Personal Settings',
-	'UCP_POST'					=> 'Posting Messages',
-	'UCP_VIEW'					=> 'Viewing Posts',
+	'UCP_PREFS_PERSONAL'		=> 'Personal Settings',
+	'UCP_PREFS_POST'			=> 'Posting Messages',
+	'UCP_PREFS_VIEW'			=> 'Viewing Posts',
+	
 	'UCP_PM'					=> 'Private Messages',
 	'UCP_PM_COMPOSE'			=> 'Compose Message',
 	'UCP_PM_DRAFTS'				=> 'PM Drafts',
 	'UCP_PM_OPTIONS'			=> 'Options',
 	'UCP_PM_UNREAD'				=> 'Unread Messages',
 	'UCP_PM_VIEW_MESSAGES'		=> 'View Messages',
+
 	'UCP_PROFILE'				=> 'Profile',
-	'UCP_AVATAR'				=> 'Your avatar',
-	'UCP_PROFILE_INFO'			=> 'Your Profile',
-	'UCP_REG_DETAILS'			=> 'Registration details',
-	'UCP_REGISTER_DISABLE'			=> 'Creating a new account is currently not possible.',
-	'UCP_SIGNATURE'				=> 'Your signature',
+	'UCP_PROFILE_AVATAR'		=> 'Your avatar',
+	'UCP_PROFILE_PROFILE_INFO'	=> 'Your Profile',
+	'UCP_PROFILE_REG_DETAILS'	=> 'Registration details',
+	'UCP_PROFILE_SIGNATURE'		=> 'Your signature',
+
+	'UCP_REGISTER_DISABLE'		=> 'Creating a new account is currently not possible.',
 	'UCP_REMIND'				=> 'Send password',
 	'UCP_WATCHED'				=> 'Watched items',
 	'UCP_WELCOME'				=> 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.',