diff options
Diffstat (limited to 'phpBB/language')
-rw-r--r-- | phpBB/language/en/acp/attachments.php | 4 | ||||
-rw-r--r-- | phpBB/language/en/acp/board.php | 1 | ||||
-rw-r--r-- | phpBB/language/en/email/forum_notify.txt | 2 | ||||
-rw-r--r-- | phpBB/language/en/email/newtopic_notify.txt | 2 | ||||
-rw-r--r-- | phpBB/language/en/email/short/newtopic_notify.txt | 2 | ||||
-rw-r--r-- | phpBB/language/en/email/short/topic_notify.txt | 2 | ||||
-rw-r--r-- | phpBB/language/en/email/topic_notify.txt | 2 | ||||
-rw-r--r-- | phpBB/language/en/install.php | 12 | ||||
-rw-r--r-- | phpBB/language/en/search_ignore_words.php | 271 | ||||
-rw-r--r-- | phpBB/language/en/search_synonyms.php | 191 |
10 files changed, 19 insertions, 470 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 5ff904f9fc..20264536ff 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -111,7 +111,7 @@ $lang = array_merge($lang, array( 'IMAGE_LINK_SIZE' => 'Image link dimensions', 'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.', - 'IMAGICK_PATH' => 'Imagemagick path', + 'IMAGICK_PATH' => 'ImageMagick path', 'IMAGICK_PATH_EXPLAIN' => 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>.', 'MAX_ATTACHMENTS' => 'Maximum number of attachments per post', @@ -147,7 +147,7 @@ $lang = array_merge($lang, array( 'REMOVE_DISALLOWED_IPS' => 'Remove or un-exclude <em>disallowed</em> IPs/hostnames', 'RESYNC_FILES_STATS_CONFIRM' => 'Are you sure you wish to resynchronise file statistics?', - 'SEARCH_IMAGICK' => 'Search for Imagemagick', + 'SEARCH_IMAGICK' => 'Search for ImageMagick', 'SECURE_ALLOW_DENY' => 'Allow/Deny list', 'SECURE_ALLOW_DENY_EXPLAIN' => 'Change the default behaviour when secure downloads are enabled of the Allow/Deny list to that of a <strong>whitelist</strong> (Allow) or a <strong>blacklist</strong> (Deny).', 'SECURE_DOWNLOADS' => 'Enable secure downloads', diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 462d66a04a..e3d8e6742f 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -575,6 +575,7 @@ $lang = array_merge($lang, array( 'SMTP_PORT' => 'SMTP server port', 'SMTP_PORT_EXPLAIN' => 'Only change this if you know your SMTP server is on a different port.', 'SMTP_SERVER' => 'SMTP server address', + 'SMTP_SERVER_EXPLAIN' => 'Note that you have to provide the protocol that your server uses. If you are using SSL, this has to be "ssl://your.mailserver.com"', 'SMTP_SETTINGS' => 'SMTP settings', 'SMTP_USERNAME' => 'SMTP username', 'SMTP_USERNAME_EXPLAIN' => 'Only enter a username if your SMTP server requires it.', diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index a05be5fd96..ccae82c862 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -2,7 +2,7 @@ Subject: Forum post notification - "{FORUM_NAME}" Hello {USERNAME}, -You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic. +You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}"<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic. {U_NEWEST_POST} diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt index 5089e7dcb8..b9416d8e40 100644 --- a/phpBB/language/en/email/newtopic_notify.txt +++ b/phpBB/language/en/email/newtopic_notify.txt @@ -2,7 +2,7 @@ Subject: New topic notification - "{FORUM_NAME}" Hello {USERNAME}, -You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. +You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. {U_FORUM} diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt index 5089e7dcb8..b9416d8e40 100644 --- a/phpBB/language/en/email/short/newtopic_notify.txt +++ b/phpBB/language/en/email/short/newtopic_notify.txt @@ -2,7 +2,7 @@ Subject: New topic notification - "{FORUM_NAME}" Hello {USERNAME}, -You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. +You are receiving this notification because you are watching the forum "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit, "{TOPIC_TITLE}". You can use the following link to view the forum, no more notifications will be sent until you visit the forum. {U_FORUM} diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt index 529478eae2..b1ed65727c 100644 --- a/phpBB/language/en/email/short/topic_notify.txt +++ b/phpBB/language/en/email/short/topic_notify.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. +You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. If you want to view the newest post made since your last visit, click the following link: {U_NEWEST_POST} diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index d5272d7416..20b86ee729 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -2,7 +2,7 @@ Subject: Topic reply notification - "{TOPIC_TITLE}" Hello {USERNAME}, -You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME !== '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. No more notifications will be sent until you visit the topic. +You are receiving this notification because you are watching the topic "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply<!-- IF AUTHOR_NAME != '' --> by {AUTHOR_NAME}<!-- ENDIF --> since your last visit. No more notifications will be sent until you visit the topic. If you want to view the newest post made since your last visit, click the following link: {U_NEWEST_POST} diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 88cbaf1533..86755c46f5 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -178,6 +178,7 @@ $lang = array_merge($lang, array( 'DB_PASSWORD' => 'Database password', 'DB_NAME' => 'Database name', 'DB_USERNAME' => 'Database username', + 'DATABASE_VERSION' => 'Database version', 'TABLE_PREFIX' => 'Prefix for tables in database', 'TABLE_PREFIX_EXPLAIN' => 'The prefix must start with a letter and must only contain letters, numbers and underscores.', @@ -213,6 +214,14 @@ $lang = array_merge($lang, array( // 'EMAIL_CONFIG' => 'E-mail configuration', + // Package info + 'PACKAGE_VERSION' => 'Package version installed', + 'UPDATE_INCOMPLETE' => 'Your phpBB installation has not been correctly updated.', + 'UPDATE_INCOMPLETE_MORE' => 'Please read the information below in order to fix this error.', + 'UPDATE_INCOMPLETE_EXPLAIN' => '<h1>Incomplete update</h1> + + <p>We noticed that the last update of your phpBB installation hasn’t been completed. Visit the <a href="%1$s" title="%1$s">database_update script</a> and run it. If it is missing, please <a href="https://www.phpbb.com/downloads/" title="phpBB downloads">download your package version</a>, upload the "install" folder to your phpBB root directory (where your config.php file is) and <a href="%1$s" title="%1$s">run the database update script</a>.</p>', + // // Server data // @@ -432,6 +441,7 @@ $lang = array_merge($lang, array( 'FILES_NOT_MODIFIED_EXPLAIN' => 'The following files are not modified and represent the original phpBB files from the version you want to update from.', 'FILES_UP_TO_DATE' => 'Already updated files', 'FILES_UP_TO_DATE_EXPLAIN' => 'The following files are already up to date and do not need to be updated.', + 'FILES_VERSION' => 'Files Version', 'TOGGLE_DISPLAY' => 'View/Hide file list', // File updater @@ -527,7 +537,7 @@ $lang = array_merge($lang, array( // Finish conversion 'CONVERT_COMPLETE' => 'Conversion completed', - 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.2. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="https://www.phpbb.com/support/docs/en/3.3/ug/">Documentation</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=466">support forums</a>.', + 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.2. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="https://www.phpbb.com/support/docs/en/3.2/ug/">Documentation</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=466">support forums</a>.', 'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.', 'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.', diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php deleted file mode 100644 index 3db209d120..0000000000 --- a/phpBB/language/en/search_ignore_words.php +++ /dev/null @@ -1,271 +0,0 @@ -<?php -/** -* -* This file is part of the phpBB Forum Software package. -* -* @copyright (c) phpBB Limited <https://www.phpbb.com> -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -if (!defined('IN_PHPBB')) -{ - exit; -} - -$words = array( - 'a', - 'about', - 'after', - 'ago', - 'all', - 'almost', - 'along', - 'alot', - 'also', - 'am', - 'an', - 'and', - 'answer', - 'any', - 'anybody', - 'anybodys', - 'anywhere', - 'are', - 'arent', - 'around', - 'as', - 'ask', - 'askd', - 'at', - 'bad', - 'be', - 'because', - 'been', - 'before', - 'being', - 'best', - 'better', - 'between', - 'big', - 'btw', - 'but', - 'by', - 'can', - 'cant', - 'come', - 'could', - 'couldnt', - 'day', - 'days', - 'days', - 'did', - 'didnt', - 'do', - 'does', - 'doesnt', - 'dont', - 'down', - 'each', - 'etc', - 'either', - 'else', - 'even', - 'ever', - 'every', - 'everybody', - 'everybodys', - 'everyone', - 'far', - 'find', - 'for', - 'found', - 'from', - 'get', - 'go', - 'going', - 'gone', - 'good', - 'got', - 'gotten', - 'had', - 'has', - 'have', - 'havent', - 'having', - 'her', - 'here', - 'hers', - 'him', - 'his', - 'home', - 'how', - 'hows', - 'href', - 'I', - 'Ive', - 'if', - 'in', - 'ini', - 'into', - 'is', - 'isnt', - 'it', - 'its', - 'its', - 'just', - 'know', - 'large', - 'less', - 'like', - 'liked', - 'little', - 'looking', - 'look', - 'looked', - 'looking', - 'lot', - 'maybe', - 'many', - 'me', - 'more', - 'most', - 'much', - 'must', - 'mustnt', - 'my', - 'near', - 'need', - 'never', - 'new', - 'news', - 'no', - 'none', - 'not', - 'nothing', - 'now', - 'of', - 'off', - 'often', - 'old', - 'on', - 'once', - 'only', - 'oops', - 'or', - 'other', - 'our', - 'ours', - 'out', - 'over', - 'page', - 'please', - 'put', - 'question', - 'questions', - 'questioned', - 'quote', - 'rather', - 'really', - 'recent', - 'said', - 'saw', - 'say', - 'says', - 'she', - 'see', - 'sees', - 'should', - 'sites', - 'small', - 'so', - 'some', - 'something', - 'sometime', - 'somewhere', - 'soon', - 'take', - 'than', - 'true', - 'thank', - 'that', - 'thatd', - 'thats', - 'the', - 'their', - 'theirs', - 'theres', - 'theirs', - 'them', - 'then', - 'there', - 'these', - 'they', - 'theyll', - 'theyd', - 'theyre', - 'this', - 'those', - 'though', - 'through', - 'thus', - 'time', - 'times', - 'to', - 'too', - 'under', - 'until', - 'untrue', - 'up', - 'upon', - 'use', - 'users', - 'version', - 'very', - 'via', - 'want', - 'was', - 'way', - 'we', - 'well', - 'went', - 'were', - 'werent', - 'what', - 'when', - 'where', - 'which', - 'who', - 'whom', - 'whose', - 'why', - 'wide', - 'will', - 'with', - 'within', - 'without', - 'wont', - 'world', - 'worse', - 'worst', - 'would', - 'wrote', - 'www', - 'yes', - 'yet', - 'you', - 'youd', - 'youll', - 'your', - 'youre', - 'yours', - 'AFAIK', - 'IIRC', - 'LOL', - 'ROTF', - 'ROTFLMAO', - 'YMMV', -); diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php deleted file mode 100644 index 6a8c257f0b..0000000000 --- a/phpBB/language/en/search_synonyms.php +++ /dev/null @@ -1,191 +0,0 @@ -<?php -/** -* -* This file is part of the phpBB Forum Software package. -* -* @copyright (c) phpBB Limited <https://www.phpbb.com> -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -if (!defined('IN_PHPBB')) -{ - exit; -} - -$synonyms = array( - 'abcense' => 'absence', - 'abridgement' => 'abridgment', - 'accomodate' => 'accommodate', - 'acknowledgment' => 'acknowledgement', - 'airplane' => 'aeroplane', - 'allright' => 'alright ', - 'andy' => 'andrew', - 'anemia' => 'anaemia', - 'anemic' => 'anaemic', - 'anesthesia' => 'anaesthesia', - 'apologize' => 'apologise', - 'archean' => 'archaean', - 'archeology' => 'archaeology', - 'archeozoic' => 'archaeozoic', - 'armor' => 'armour', - 'artic' => 'arctic', - 'attachment' => 'attachement', - 'attendence' => 'attendance', - - 'barbecue' => 'barbeque', - 'behavior' => 'behaviour', - 'biassed' => 'biased', - 'biol' => 'biology', - 'buletin' => 'bulletin', - - 'calender' => 'calendar', - 'canceled' => 'cancelled', - 'car' => 'automobile', - 'catalog' => 'catalogue', - 'cenozoic' => 'caenozoic', - 'center' => 'centre', - 'check' => 'cheque', - 'color' => 'colour', - 'comission' => 'commission', - 'comittee' => 'committee', - 'commitee' => 'committee', - 'conceed' => 'concede', - 'creating' => 'createing', - 'curiculum' => 'curriculum', - - 'defense' => 'defence', - 'develope' => 'develop', - 'discription' => 'description', - 'dulness' => 'dullness', - - 'encyclopedia' => 'encyclopaedia', - 'enroll' => 'enrol', - 'esthetic' => 'aesthetic', - 'etiology' => 'aetiology', - 'exhorbitant' => 'exorbitant', - 'exhuberant' => 'exuberant', - 'existance' => 'existence', - - 'favorite' => 'favourite', - 'fetus' => 'foetus', - 'ficticious' => 'fictitious', - 'flavor' => 'flavour', - 'flourescent' => 'fluorescent', - 'foriegn' => 'foreign', - 'fourty' => 'forty', - - 'gage' => 'gauge', - 'geneology' => 'genealogy', - 'grammer' => 'grammar', - 'gray' => 'grey', - 'guerilla' => 'guerrilla', - 'gynecology' => 'gynaecology', - - 'harbor' => 'harbour', - 'heighth' => 'height', - 'hemaglobin' => 'haemaglobin', - 'hematin' => 'haematin', - 'hematite' => 'haematite', - 'hematology' => 'haematology', - 'honor' => 'honour', - - 'innoculate' => 'inoculate', - 'installment' => 'instalment', - 'irrelevent' => 'irrelevant', - 'irrevelant' => 'irrelevant', - - 'jeweler' => 'jeweller', - 'judgment' => 'judgement', - - 'labeled' => 'labelled', - 'labor' => 'labour', - 'laborer' => 'labourer', - 'laborers' => 'labourers', - 'laboring' => 'labouring', - 'licence' => 'license', - 'liesure' => 'leisure', - 'liquify' => 'liquefy', - - 'maintainance' => 'maintenance', - 'maintenence' => 'maintenance', - 'medieval' => 'mediaeval', - 'meter' => 'metre', - 'milage' => 'mileage', - 'millipede' => 'millepede', - 'miscelaneous' => 'miscellaneous', - 'morgage' => 'mortgage', - - 'noticable' => 'noticeable', - - 'occurence' => 'occurrence', - 'offense' => 'offence', - 'ommision' => 'omission', - 'ommission' => 'omission', - 'optimize' => 'optimise', - 'organize' => 'organise', - - 'pajamas' => 'pyjamas', - 'paleography' => 'palaeography', - 'paleolithic' => 'palaeolithic', - 'paleontological' => 'palaeontological', - 'paleontologist' => 'palaeontologist', - 'paleontology' => 'palaeontology', - 'paleozoic' => 'palaeozoic', - 'pamplet' => 'pamphlet', - 'paralell' => 'parallel', - 'parl' => 'parliament', - 'parlt' => 'parliament', - 'pediatric' => 'paediatric', - 'pediatrician' => 'paediatrician', - 'pediatrics' => 'paediatrics', - 'pedodontia' => 'paedodontia', - 'pedodontics' => 'paedodontics', - 'personel' => 'personnel', - 'practise' => 'practice', - 'program' => 'programme', - 'psych' => 'psychology', - - 'questionaire' => 'questionnaire', - - 'rarify' => 'rarefy', - 'reccomend' => 'recommend', - 'recieve' => 'receive', - 'resistence' => 'resistance', - 'restaraunt' => 'restaurant', - - 'savior' => 'saviour', - 'sep' => 'september', - 'seperate' => 'separate', - 'sept' => 'september', - 'sieze' => 'seize', - 'summarize' => 'summarise', - 'summerize' => 'summarise', - 'superceed' => 'supercede', - 'superintendant' => 'superintendent', - 'supersede' => 'supercede', - 'suprise' => 'surprise', - 'surprize' => 'surprise', - 'synchronise' => 'synchronize', - - 'temperary' => 'temporary', - 'theater' => 'theatre', - 'threshhold' => 'threshold', - 'transfered' => 'transferred', - 'truely' => 'truly', - 'truley' => 'truly', - - 'useable' => 'usable', - - 'valor' => 'valour', - 'vigor' => 'vigour', - 'vol' => 'volume', - - 'whack' => 'wack', - 'withold' => 'withhold', - - 'yeild' => 'yield', -); |