aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-06-221-1/+1
|\
| * [ticket/10228] Correct "trigger" to "triggered" in acp registration settingsNils Adermann2011-06-221-1/+1
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-181-4/+4
|\ \ | |/
| * [ticket/10229] On languge/acp/styles.php "%s" should be %sRaimon2011-06-181-4/+4
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-161-1/+1
|\ \ | |/
| * [ticket/10221] Append unit (seconds) after input field, remove from explanationNils Adermann2011-06-161-1/+1
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-121-1/+1
|\ \ | |/
| * [ticket/10211] Add spce after dot in new language stringNils Adermann2011-06-121-1/+1
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-111-3/+9
|\ \ | |/
| * [ticket/9992] Clarify explanations of ip and account limits on loginNils Adermann2011-06-111-2/+2
| * [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAINNils Adermann2011-06-111-1/+1
| * [ticket/9992] Adding a limit on login attempts per IP.Nils Adermann2011-06-101-3/+9
* | Merge branch 'develop-olympus' into developNils Adermann2011-06-101-1/+1
|\ \ | |/
| * Merge branch 'ticket/rxu/6712' into develop-olympusNils Adermann2011-06-101-1/+1
| |\
| | * [ticket/6712] Properly explain result of setting the bump interval to 0.Nils Adermann2011-06-101-1/+1
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-0/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'naderman/ticket/10005' into develop-olympusAndreas Fischer2011-06-091-0/+1
| |\ \
| | * | [ticket/10005] Add validation of dropdown custom profile field valuesNils Adermann2011-06-021-0/+1
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-2/+2
|\ \ \ \ | |/ / /
| * | | [ticket/10203] Fix quotations and hyphen in language strings for PHPBB3-10067Joas Schilling2011-06-091-2/+2
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-051-5/+5
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/p/10067' into develop-olympusNils Adermann2011-06-051-5/+5
| |\ \ \
| | * | | [ticket/10067] Clarify language for user activation options in ACP.Oleg Pudeyev2011-04-301-5/+5
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-051-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ticket/nickvergessen/10158' into develop-olympusNils Adermann2011-06-051-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/10158] Only view "Return to" links if they are useful.Joas Schilling2011-05-231-0/+1
| | |/ /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-05-232-4/+3
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'p/ticket/9630' into develop-olympusAndreas Fischer2011-05-232-4/+3
| |\ \ \
| | * | | [ticket/9630] Make language for moving posts clearer in quickmod/mcp.Oleg Pudeyev2011-05-022-4/+3
| | |/ /
* | | | Merge remote-tracking branch 'nickvergessen/ticket/8542' into developOleg Pudeyev2011-05-202-0/+3
|\ \ \ \
| * | | | [ticket/8542] Display custom profile fields in private messagesJoas Schilling2011-05-202-0/+3
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-101-3/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'bantu/ticket/10170' into develop-olympusOleg Pudeyev2011-05-101-3/+3
| |\ \ \ \
| | * | | | [ticket/10170] Include www in hostname in language strings.Andreas Fischer2011-05-111-3/+3
| | * | | | [ticket/10170] Update language entriesErik Frèrejean2011-05-101-3/+3
| | | |/ / | | |/| |
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-05-092-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.Andreas Fischer2011-05-092-1/+1
| |/ / /
* | | | Merge branch 'feature/rxu/attachment-management-no-reassignment' into developOleg Pudeyev2011-04-242-0/+16
|\ \ \ \
| * | | | [feature/attachment-management-no-reassignment] Handle privacy and some more.rxu2011-04-242-1/+6
| * | | | [feature/attachment-management-no-reassignment] Further feature adjustments.rxu2011-04-111-1/+5
| * | | | [feature/attachment-management-no-reassignment] Attachments managementrxu2011-04-101-0/+7
| | |/ / | |/| |
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-221-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.Andreas Fischer2011-04-221-1/+1
* | | | Merge branch 'ticket/nickvergessen/9684' into developOleg Pudeyev2011-04-111-0/+1
|\ \ \ \
| * | | | [ticket/9684] Move currently existing GAs to a selectable forum while updating.Joas Schilling2011-04-071-0/+1
| | |/ / | |/| |
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-101-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'ticket/bantu/10123' into develop-olympusOleg Pudeyev2011-04-101-3/+3
| |\ \ \
| | * | | [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.Andreas Fischer2011-04-081-3/+3
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-101-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ticket/erikfrerejean/9581' into develop-olympusOleg Pudeyev2011-04-101-2/+4
| |\ \ \ \ | | |/ / / | |/| | |