summaryrefslogtreecommitdiff
path: root/inc/lang/en
Commit message (Collapse)AuthorAge
* Merge pull request #1072 from flammy/masterAnika Henke2015-05-09
|\ | | | | Added file-in-use reference to page
| * Added file-in-use reference to pageflammy2015-03-12
| | | | | | Added english translation for file-in-use reference
* | Report more meaningful errors when an auth backend fails. closes #1093Patrick Brown2015-05-06
| |
* | Remove no longer needed language stringPatrick Brown2015-04-04
| |
* | Remove unused language stringsPatrick Brown2015-04-03
|/
* "Login" and "Logout" become "Log In" and "Log Out"Gilles-Philippe Morin2015-01-18
| | | This change improves consistency with neighboring links such as "Update Profile" and "Register", which are two action verbs. "Login" and "Logout" were nouns and not verbs. Title case capitalization is applied because of "Update Profile".
* "Recent changes" becomes "Recent Changes"Gilles-Philippe Morin2015-01-13
| | | To improve consistency: it is surrounded by "Update Profile" and "Media Manager".
* Merge pull request #624 from lisps/revisionsAndreas Gohr2014-09-29
|\ | | | | date_at support
| * parse AT parameter: first strtotime then timestamplisps2014-09-29
| | | | | | | | remove config option
| * Merge remote-tracking branch master into revisionslisps2014-09-26
| |\
| * | add config date_at_formatlisps2014-03-19
| | | | | | | | | change translation message
| * | Merge remote-tracking branch 'remotes/origin/master' into revisions_locallisps2014-03-19
| |\ \
| * \ \ Merge remote-tracking branch 'origin/diff_navigation' into revisionslisps2014-02-17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: inc/parser/xhtml.php
| * | | | localize msglisps2013-11-22
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonlyGerrit Uitslag2014-09-28
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: inc/lang/hr/searchpage.txt inc/lang/ko/searchpage.txt
| * | | | Merge remote-tracking branch 'origin/master' into trailingcolonsGerrit Uitslag2014-05-26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: inc/lang/cs/lang.php inc/lang/hu/lang.php
| | * | | | check mbstring function overloading in installer. closes #736Andreas Gohr2014-05-24
| | | |_|/ | | |/| |
| * / | | Move colon from code to language stringsGerrit Uitslag2014-05-16
| |/ / /
| * | | notloggedin lang string leftGerrit Uitslag2014-03-17
| | | |
| * | | Merge pull request #573 from splitbrain/FS#2437detailphprefactorAndreas Gohr2014-03-16
| |\ \ \ | | | | | | | | | | refactor detail.php to template.php
| | * | | refactor detail.php to template.phpGerrit Uitslag2014-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | - refactor detail en mediamanager link creation - refactor metadata listing
| * | | | Merge branch 'master' into diff_navigationAndreas Gohr2014-03-14
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (103 commits) Add a basic test case for the cache Events: Trigger a warning if the default action is not callable Fix caching (make the event callback public again) translation update translation update translation update translation update translation update translation update translation update avoid HTTP image screenshot urls. closes #595 translation update Extension manager: Fix cache extension to be .repo adjusted the office type color again another instance of empty() where an array key might not exist remove placeholder van denied.txt updated file icons once more removed 'not logged in' text, loginform is shown already Revert "added stripped bit to language file" fixed index file ... Conflicts: inc/html.php
| | * | | remove placeholder van denied.txtGerrit Uitslag2014-03-07
| | | | |
| | * | | added login form at denied access pageGerrit Uitslag2014-03-04
| | | | | | | | | | | | | | | | | | | | - restore lang string as well
| | * | | Show 'not logged in' only when logged out FS#2124Gerrit Uitslag2014-02-25
| | |/ /
| * | | remove unnecessary strings and Dutch diff strings (better later once)Gerrit Uitslag2014-02-17
| | | |
| * | | replace arrows in names of diff links by textsGerrit Uitslag2014-02-17
| | | |
| * | | Merge remote-tracking branch 'origin/master' into diff_navigationGerrit Uitslag2014-02-15
| |\| | | | |/ | |/|
| * | Merge remote-tracking branch 'origin/master' into diff_navigationGerrit Uitslag2013-11-19
| |\ \
| * \ \ merge master in branchKlap-in2013-07-14
| |\ \ \
| * | | | Added diff navigationKlap-in2013-01-27
| | | | | | | | | | | | | | | | | | | | Navigation links to move to previous edit before revision in left column or next/last edit after revision in right column.
* | | | | Update text above searchresults, when only read-acl FS#2697Gerrit Uitslag2014-02-21
| |_|_|/ |/| | |
* | | | renamed code button to monospace FS#2934 and many othersAndreas Gohr2014-02-05
| |_|/ |/| | | | | | | | Let's stop confusing people with what this button does
* | | swapped logic for allowing/disabling registration in installerAnika Henke2013-11-17
| | |
* | | changed user approval option to disable registration option in installerAnika Henke2013-11-17
| | |
* | | added possibility to approve users to ACL policies in installerAnika Henke2013-11-09
| | |
* | | localize some meta header titels. Fixes FS#2409Gerrit Uitslag2013-10-31
| | |
* | | removed unused lang string (authmodfailed)Anika Henke2013-09-03
| | |
* | | Fix CodeSniffer violationsMatt Perry2013-08-20
| | | | | | | | | | | | | | | Remove whitespace from end of lines to reduce the number of CodeSniffer violations.
* | | Merge branch 'FS#2751' of git://github.com/splitbrain/dokuwiki into ↵Andreas Gohr2013-08-02
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull-request-245 * 'FS#2751' of git://github.com/splitbrain/dokuwiki: coding corrections. correct type hint, remove unused variable assignment de/de-informal: localization updates (delete user function) unit tests for self deleting of user accounts FS#2751 - self deletion of user account
| * | | FS#2751 - self deletion of user accountChristopher Smith2013-07-31
| | |/ | |/|
* / | added aria attributes to edit modeAnika Henke2013-08-01
|/ /
* / Language files: insignificant fixesKiril LastName2013-03-06
|/
* Merge branch 'subscription' Pull Request #125Andreas Gohr2013-01-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * subscription: (25 commits) link directly to subscription management in mails only use mailfromnobody for bulk mails added missing context for list mails readded mailfromnobody to subscription sending correctly escape diffs in HTML mails fixed lists in HTML mails simplified subscription->add() code a bit comment adjusted removed unused vars removed data parameter in subscription_handle_post() fixed tests some reformatting added compatibility function moved registration notification to subscription class fixed merge error in inc/auth.php consolidate more notification code in subscription class minor cleanup initialize new subscriptions with current time fixed subscription management correctly check if subscriptions are enabled ...
| * link directly to subscription management in mailsAndreas Gohr2013-01-26
| | | | | | | | | | This was updated in the english translation a while ago, but was still missing in some translations
* | added option to enable automatic popularity data in installerAndreas Gohr2012-12-07
| |
* | Re-phrased "no license" installer textHakan Sandell2012-12-02
| |
* | Merge pull request #119 from whoopdedo/installerstringsAndreas Gohr2012-12-02
|\ \ | |/ |/| Translatable string for "None" license selection
| * Translatable string for "None" license selectionTom N Harris2012-07-17
| | | | | | | | | | The position of the option was moved to the end of the list so the English label "None of the above" will make sense.
* | Merge branch 'guide' of git://github.com/splitbrain/dokuwiki into ↵Andreas Gohr2012-11-18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull-request-118 * 'guide' of git://github.com/splitbrain/dokuwiki: changed semicolon to colon in link to welcome page to make it less confusing added initial pages to not be ignored by git improved welcome text added welcome page changed the link in the installer to point to wiki:welcome Conflicts: inc/lang/fr/lang.php
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 06:35:07 +0000