| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -650,6 +650,8 @@ |
| 651 | 651 | 'mergehistory-no-destination', |
| 652 | 652 | 'mergehistory-invalid-source', |
| 653 | 653 | 'mergehistory-invalid-destination', |
| | 654 | + 'mergehistory-autocomment', |
| | 655 | + 'mergehistory-comment', |
| 654 | 656 | ), |
| 655 | 657 | 'mergelog' => array( |
| 656 | 658 | 'mergelog', |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1183,8 +1183,8 @@ |
| 1184 | 1184 | |
| 1185 | 1185 | # History merging |
| 1186 | 1186 | 'mergehistory' => 'Merge page histories', |
| 1187 | | -'mergehistory-header' => "This page lets you merge revisions of the history of one source page into a newer page. |
| 1188 | | -Make sure that this change will maintain historical page continuity.", |
| | 1187 | +'mergehistory-header' => 'This page lets you merge revisions of the history of one source page into a newer page. |
| | 1188 | +Make sure that this change will maintain historical page continuity.', |
| 1189 | 1189 | 'mergehistory-box' => 'Merge revisions of two pages:', |
| 1190 | 1190 | 'mergehistory-from' => 'Source page:', |
| 1191 | 1191 | 'mergehistory-into' => 'Destination page:', |