aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-121-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums. [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
| | * | | | [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.Andreas Fischer2011-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8802
| | * | | | [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.Andreas Fischer2011-03-101-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking "Mark forums read" when not browsing on the index page only marks all subforums (and sub-sub forums etc.) read, topics in the current forum have to marked seperately by clicking the "Mark topics read" link. Let's indicate this circumstance by using the word "subforums". PHPBB3-8802
| * | | | Merge branch 'ticket/9549' into developOleg Pudeyev2011-03-012-0/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/9549: [ticket/9549] Display users in their primary group instead of their first group [ticket/9549] Change default value of "sort legend by group name" to false. [ticket/9549] Fix displaying empty groups [ticket/9549] Fix language strings. [ticket/9549] Only add group to legend/teampage when the checkbox is checked. [ticket/9549] New method move() to move a group more than 1 up/down. [ticket/9549] Fix some minor issues with descriptions and coding-guidelines. [ticket/9549] Throw an error when the given field-name is invalid. [ticket/9549] Make the class non static and extend delete_group function. [ticket/9549] Add template changes for subsilver2. [ticket/9549] Enhance teampage and legend functionality [ticket/9549] Add the module and files for the ACP. [ticket/9549] Update database with the new config values and columns [ticket/9549] Enhance teampage functionality with a new class, group_positions. Conflicts: phpBB/install/database_update.php
| | * | | | [ticket/9549] Display users in their primary group instead of their first groupJoas Schilling2011-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9549
| | * | | | [ticket/9549] Fix language strings.Joas Schilling2011-02-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9549
| | * | | | [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.Joas Schilling2011-02-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9549
| | * | | | [ticket/9549] Add the module and files for the ACP.Joas Schilling2011-02-162-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9549
* | | | | | [feature/prune-users] Adjust some language strings for new featuresJosh Woody2011-05-081-5/+9
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust two language strings for ACP prune feature to include descriptions for new features. PHPBB3-9622
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-211-2/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9675] Correctly check whether the style/component is still in use. [ticket/9675] Put the code into methods to avoid code duplication. [ticket/9675] Adjust the language-string to reflect the changes. [ticket/9675] Add option to delete template/theme/imageset when deleting style.
| * | | [ticket/9675] Put the code into methods to avoid code duplication.Joas Schilling2011-02-081-3/+4
| | | | | | | | | | | | | | | | PHPBB3-9675
| * | | [ticket/9675] Adjust the language-string to reflect the changes.Joas Schilling2011-02-081-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9675
| * | | [ticket/9675] Add option to delete template/theme/imageset when deleting style.Joas Schilling2011-02-081-1/+4
| | | | | | | | | | | | | | | | PHPBB3-9675
* | | | [feature/system-cron] Added acp ui for use_system_cron config setting.Oleg Pudeyev2011-02-121-0/+2
| | | | | | | | | | | | | | | | PHPBB3-9596
* | | | [ticket/6109] MSN is now called Windows Live Messenger (WLM)Joas Schilling2011-01-104-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Replaced the logo with the current one and changed the language strings. PHPBB3-6109
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-12-291-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'. [ticket/9953] Set focus to password on re-authentication [ticket/9905] Add SQLite to the DSN description [ticket/9859] Remove years from the credit line.
| * | | [ticket/9905] Add SQLite to the DSN descriptionPatrick Webster2010-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The installer's DSN field has additional meanings for ODBC, PostgreSQL, and SQLite, but only the first two are mentioned. SQLite uses it for the file path. PHPBB3-9905
* | | | Merge branch 'ticket/VSE/9532' into developAndreas Fischer2010-12-281-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/VSE/9532: [ticket/9532] Simplified page titles by removing meaningless text.
| * | | | [ticket/9532] Simplified page titles by removing meaningless text.Matt2010-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed View Forum, View Topic, added pagination to forum and topic page titles, also moved the Site Name to the end of title for forum and topic view pages. PHPBB3-9532
* | | | | Merge branch 'develop-olympus' into developNils Adermann2010-12-135-4/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9851] "Search new posts" should require login. [task/phpdoc] Added a phpdoc task to the build process [task/phpdoc] Added a configuration file for phpDocumentor. [feature/acm-wincache] Adding caching module for WinCache's User Cache. [ticket/9939] Fix JavaScript error in admin recaptcha template [ticket/9575] Also change 'administrate' to 'administer' in templates [ticket/8736] guest can have 255 chars long username [ticket/9928] Do not link "login to your board" to the "send statistics" page. [ticket/9575] Change 'administrate' to 'administer' [ticket/9921] Adding sample configuration file for the lighttpd webserver. [ticket/9932] Add the Bing bot when converting [ticket/9930] Redirect failes with open_basedir enabled. [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
| * | | | Merge branch 'ticket/adamreyher/9928' into develop-olympusNils Adermann2010-12-131-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/adamreyher/9928: [ticket/9928] Do not link "login to your board" to the "send statistics" page.
| | * | | | [ticket/9928] Do not link "login to your board" to the "send statistics" page.Adam Reyher2010-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9928
| * | | | | [ticket/9851] "Search new posts" should require login.rxu2010-12-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newposts search uses user_lastvisit, so it should require user to log in. PHPBB3-9851
| * | | | | [ticket/9575] Change 'administrate' to 'administer'Adam Reyher2010-12-013-3/+3
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9575
* | | | | Merge branch 'ticket/igorw/9556' into developNils Adermann2010-12-1335-69/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9556: [ticket/9556] Drop php closing tags, add trailing newline Conflicts: phpBB/includes/constants.php
| * | | | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-1135-69/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* | | | | [ticket/9897] A few language fixesRMcGirr832010-11-211-3/+3
|/ / / / | | | | | | | | | | | | PHPBB3-9897
* | | | Merge branch 'ticket/sa007/9847' into develop-olympusAndreas Fischer2010-11-081-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/sa007/9847: [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.
| * | | | [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.SA0072010-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The word "gauge" was misspelled as "guage". The word "judgement" is preferred over "judgment" in british english. PHPBB3-9847
* | | | | [ticket/9883] Change an American English spelling to British English.SA0072010-11-081-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-9883
* | | | [ticket/9880] Change "antibot" to "anti-spambot".Andreas Fischer2010-11-071-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9880
* | | | [ticket/9880] Changing the term 'CAPTCHA' to something more obvious.Chris Smith2010-11-073-35/+35
| | | | | | | | | | | | | | | | PHPBB3-9880
* | | | Merge branch 'ticket/cs278/9752' into develop-olympusNils Adermann2010-11-071-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9752: [ticket/9752] Mark unused language variable as such. [ticket/9752] Change reference to 'confirmation code' to be more generic.
| * | | | [ticket/9752] Mark unused language variable as such.Chris Smith2010-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9752
| * | | | [ticket/9752] Change reference to 'confirmation code' to be more generic.narqelion2010-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to 71b35a924f7a5f517e8d07d975582c27813f5797 PHPBB3-9752
| | | | |
| \ \ \ \
*-. \ \ \ \ Merge remote branches 'github-bantu/ticket/9879' and ↵Nils Adermann2010-11-072-15/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'github-cs278/ticket/9095' into develop-olympus * github-bantu/ticket/9879: [ticket/9879] Fix markup and use Q&A instead of Q & A for consistency. [ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA. * github-cs278/ticket/9095: [ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.
| | * | | | [ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.narqelion2010-11-071-9/+9
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the addition of CAPTCHA plugins in 3.0.6 a number of language strings need updating to account for non visual based CAPTCHAs. PHPBB3-9095
| * | | | [ticket/9879] Fix markup and use Q&A instead of Q & A for consistency.Andreas Fischer2010-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9879
| * | | | [ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA.narqelion2010-11-071-6/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed spelling, punctuation and grammar as well as removed registration specific language from plugin as it can be/is used for form submissions other than registration. PHPBB3-9879
* | | | [ticket/9850] Display upgrade instructions for feature release in acpIgor Wiedler2010-11-021-0/+1
| | | | | | | | | | | | | | | | PHPBB3-9850
| | | |
| \ \ \
| \ \ \
| \ \ \
*---. \ \ \ Merge branches 'ticket/bantu/9101', 'ticket/bantu/9595' and ↵Igor Wiedler2010-10-252-1/+3
|\ \ \ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ticket/bantu/9853' into develop-olympus * ticket/bantu/9101: [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN. * ticket/bantu/9595: [ticket/9595] List min/max characters indexed by search for mysql_fulltext. * ticket/bantu/9853: [ticket/9853] Change recaptcha theme from default to 'clean'.
| | * | | | [ticket/9595] List min/max characters indexed by search for mysql_fulltext.Andreas Fischer2010-10-211-0/+2
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-9595
| * | | | [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.Andreas Fischer2010-10-181-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Remove misleading 'below' from RECAPTCHA_EXPLAIN because recaptcha is actually displayed to the side. PHPBB3-9101
* | | | [ticket/9478] Validate maximum number of allowed recipients per PM value.rxu2010-10-251-0/+6
|/ / / | | | | | | | | | | | | | | | Do not allow to enter the value larger than it's allowed by MySQL mediumnt(8). PHPBB3-9478
* | | [ticket/9822] Correct some style related ACP explain statements.Andreas Fischer2010-10-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "Additionally, if you have permission you can elect to remove the set from the filesystem." because that functionality is not implemented. Also remove unnecessary "When the imageset is deleted it is gone for good." statement, "It is recommended that you first export your set for possible future use." should be clear enough. PHPBB3-9822
* | | [ticket/9613] Slightly update language strings.Andreas Fischer2010-08-292-2/+2
| | | | | | | | | | | | PHPBB3-9613
* | | [ticket/9613] Implement a load switch for unread posts search feature.rxu2010-08-292-0/+2
| |/ |/| | | | | | | | | | | | | Since unread posts search can produce a high server load in certain circumstances, we implement a switch for ACP "Load settings" to have an option to disable this type of search. PHPBB3-9613
* | [ticket/9761] Reworded quote nesting depth ACP option to match the behaviourPatrick W2010-07-121-2/+2
| | | | | | | | | | | | | | The nesting depth applies per quote block, not per post which the previous label and description indicated. PHPBB3-9761
* | Merge branch 'ticket/bantu/9068' into develop-olympusAndreas Fischer2010-07-221-1/+1
|\ \ | | | | | | | | | | | | * ticket/bantu/9068: [ticket/9068] Added a missing comma in acp load settings explanation text.
| * | [ticket/9068] Added a missing comma in acp load settings explanation text.Nick Anderegg2010-07-221-1/+1
| | | | | | | | | | | | PHPBB3-9068