aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-12-081-1/+1
|\
| * Merge remote-tracking branch 'p/ticket/10511' into develop-olympusAndreas Fischer2011-12-081-1/+1
| |\
| | * [ticket/10511] Fix a grammar defect in permissions language.Oleg Pudeyev2011-12-031-1/+1
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-081-2/+2
|\ \ \ | |/ /
| * | [ticket/9876] Distinctly name user and forum roles for newly registered users.Oleg Pudeyev2011-12-031-2/+2
| |/
* | Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into developOleg Pudeyev2011-12-0311-139/+277
|\ \
| * | [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizesJoas Schilling2011-11-271-0/+4
| * | [ticket/10345] Fix parsing error in language/en/viewtopic.phpJoas Schilling2011-11-271-1/+1
| * | [ticket/10345] Remove more useless 0-casesJoas Schilling2011-11-256-25/+0
| * | [ticket/10345] Remove some unused 0 casesJoas Schilling2011-11-255-16/+0
| * | [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()Joas Schilling2011-11-251-10/+10
| * | [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-257-34/+88
| * | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-259-93/+209
| * | [ticket/10345] Remove '1 hour ago' string which conflicted with plural rulesJoas Schilling2011-11-251-1/+0
| * | [ticket/10345] Fix documentation on the new function and the switchJoas Schilling2011-11-251-0/+1
| * | [ticket/10345] Add a system to allow multiple plural formsJoas Schilling2011-11-251-0/+5
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-291-2/+2
|\ \ \ | |/ / |/| / | |/
| * [ticket/10501] Fix description of table prefixesJoas Schilling2011-11-281-2/+2
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+1
|\ \ | |/
| * Merge remote-tracking branch 'nickvergessen/ticket/10479' into prep-release-3...Oleg Pudeyev2011-11-231-1/+1
| |\
| | * [ticket/10479] Remove PostgreSQL version numbers from driver's language stringJoas Schilling2011-11-211-1/+1
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-191-0/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympusOleg Pudeyev2011-11-191-0/+1
| |\ \ | | |/ | |/|
| | * [ticket/10239] Add confirm box to backup restore.Chris Smith2011-09-211-0/+1
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-171-0/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympusOleg Pudeyev2011-11-171-0/+1
| |\ \
| | * | [ticket/10157] Add notification to update cpfs when installing a language.Joas Schilling2011-11-171-0/+1
| | |/
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-151-0/+10
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympusAndreas Fischer2011-11-151-0/+10
| |\ \
| | * | [ticket/10419] Reword the language stringsrxu2011-11-151-8/+8
| | * | [ticket/10419] Reword some language strings, minor code changesrxu2011-11-051-4/+4
| | * | [ticket/10419] Add mbstring PHP ini parameters checks to ACPrxu2011-10-181-0/+10
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-141-0/+3
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympusAndreas Fischer2011-11-141-0/+3
| |\ \ \
| | * | | [ticket/9361] View correct error messages when editing account informationJoas Schilling2011-11-141-0/+3
| | | |/ | | |/|
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-141-0/+2
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympusAndreas Fischer2011-11-141-0/+2
| |\ \ \
| | * | | [ticket/9066] Disallow some database prefix to prevent same errors and problemsJoas Schilling2011-11-131-0/+2
| | |/ /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-0/+3
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympusAndreas Fischer2011-11-131-0/+3
| |\ \ \
| | * | | [ticket/10087] Organize bans in acp_baninto optgroupsIgor Wiedler2011-11-111-0/+3
| | |/ /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'igorw/ticket/8616' into develop-olympusAndreas Fischer2011-11-131-1/+1
| |\ \ \
| | * | | [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGEIgor Wiedler2011-10-131-1/+1
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10410' into developAndreas Fischer2011-11-011-2/+4
|\ \ \ \ \
| * | | | | [ticket/10410] Add option to display users in their first teampage groupJoas Schilling2011-10-281-2/+4
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2011-10-301-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'remotes/marc1706/ticket/9778' into develop-olympusJoas Schilling2011-10-301-0/+1
| |\ \ \ \ \
| | * | | | | [ticket/9778] Replaced "Find a member" with "Enter username"Marc Alexander2011-10-301-0/+1
* | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /