diff options
| author | lisps <stummp@loewen.de> | 2014-02-17 23:15:36 +0100 |
|---|---|---|
| committer | lisps <stummp@loewen.de> | 2014-02-17 23:15:36 +0100 |
| commit | d90a79c0ee1837353622e4b2abb0753ca09dffd2 (patch) | |
| tree | 554da8dc13606efc2bc1ea7fe3697a5ff87d02e5 /inc/lang/en/lang.php | |
| parent | f2643d9ff318af1d2fbb6249e929212381959247 (diff) | |
| parent | a83975113c7725a13144b3e65bfb58c8447d37d7 (diff) | |
| download | rpg-d90a79c0ee1837353622e4b2abb0753ca09dffd2.tar.gz rpg-d90a79c0ee1837353622e4b2abb0753ca09dffd2.tar.bz2 | |
Merge remote-tracking branch 'origin/diff_navigation' into revisions
Conflicts:
inc/parser/xhtml.php
Diffstat (limited to 'inc/lang/en/lang.php')
| -rw-r--r-- | inc/lang/en/lang.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index ad887f4c4..7986ebc00 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -191,10 +191,11 @@ $lang['difflink'] = 'Link to this comparison view'; $lang['diff_type'] = 'View differences:'; $lang['diff_inline'] = 'Inline'; $lang['diff_side'] = 'Side by Side'; -$lang['diffpreviousedit'] = 'Previous edit'; -$lang['diffnextedit'] = 'Next edit'; -$lang['difflastedit'] = 'Last edit'; -$lang['overviewrevs'] = 'Overview of revisions'; +$lang['diffprevrev'] = 'Previous revision'; +$lang['diffnextrev'] = 'Next revision'; +$lang['difflastrev'] = 'Last revision'; +$lang['diffbothprevrev'] = 'Both sides previous revision'; +$lang['diffbothnextrev'] = 'Both sides next revision'; $lang['line'] = 'Line'; $lang['breadcrumb'] = 'Trace'; $lang['youarehere'] = 'You are here'; @@ -228,7 +229,7 @@ $lang['both_changes'] = 'Both pages and media files'; $lang['qb_bold'] = 'Bold Text'; $lang['qb_italic'] = 'Italic Text'; $lang['qb_underl'] = 'Underlined Text'; -$lang['qb_code'] = 'Code Text'; +$lang['qb_code'] = 'Monospaced Text'; $lang['qb_strike'] = 'Strike-through Text'; $lang['qb_h1'] = 'Level 1 Headline'; $lang['qb_h2'] = 'Level 2 Headline'; |