makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 20:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/language/en
History
Nathan Guse 052bbf654f Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop 
* remotes/upstream/develop-olympus:
  [ticket/12106] Combined first and second sentence
  [ticket/12106] Adds a explaination that admin/mods still able to use the board

Conflicts:
	phpBB/language/en/acp/board.php
2014-03-10 21:51:07 -05:00
..
acp Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop 2014-03-10 21:51:07 -05:00
email Merge branch 'develop-olympus' into develop 2013-11-19 15:28:37 +01:00
mods [feature/sphinx-fulltext-search] integrate sphinx language keys with core 2012-07-12 17:31:49 +05:30
app.php [feature/controller] Remove unused language strings 2012-11-18 15:51:32 -05:00
captcha_qa.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
captcha_recaptcha.php [ticket/9975] Moved a few E_USER_ERROR errors to /language 2013-04-23 09:55:36 -07:00
common.php Merge branch 'develop-olympus' into develop 2014-03-10 21:44:04 -05:00
groups.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
help_bbcode.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
help_faq.php Merge branch 'develop-olympus' into develop 2013-07-25 14:08:06 +02:00
index.htm ISO 2002-10-04 12:40:07 +00:00
install.php [ticket/11574] Remove install/udpate/new/ fallback from database_update.php 2013-07-30 01:38:06 +02:00
iso.txt #10549 2007-05-13 22:20:30 +00:00
mcp.php [ticket/9657] Fix english language :( 2013-07-11 22:46:34 -04:00
memberlist.php [ticket/12236] Move AOL Instant Messanger field to custom profile field 2014-03-05 22:13:22 +01:00
migrator.php [ticket/11883] Report completed data step in migration as "Installing Data" 2013-10-02 14:27:46 -05:00
plupload.php [ticket/12206] Fix mismatched Plupload language vars preventing localization. 2014-02-17 12:33:19 -08:00
posting.php [ticket/11894] Fix typo in "Delete post" option 2013-10-05 20:59:07 -07:00
search.php [ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE. 2014-01-16 11:48:40 -08:00
search_ignore_words.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
search_synonyms.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
ucp.php [ticket/12251] Add string validation for a-zA-Z0-9 and underscore 2014-03-06 12:28:36 +01:00
viewforum.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
viewtopic.php [ticket/12187] Remove user_website functionality 2014-03-03 20:01:19 +01:00