Merge "add htmlform-no and htmlform-yes messages for generic yes-no questions"

diff --cc languages/messages/MessagesEn.php
Simple merge

diff --cc languages/messages/MessagesQqq.php
index 0c705a5,ca964c6..0abf42e
--- 1/languages/messages/MessagesQqq.php
--- 2/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@@ -8627,27 -4951,25 +8627,29 @@@ See also
  * stub threshold (appearance tab)
  
  {{Identical|Other}}',
+ 'htmlform-no' => 'Used in form, such as with radio buttons, for generic yes / no questions',
+ 'htmlform-yes' => 'Used in form, such as with radio buttons, for generic yes / no questions',
  
  # SQLite database support
 -'sqlite-has-fts' => 'Shown on Special:Version, $1 is version',
 -'sqlite-no-fts' => 'Shown on Special:Version, $1 is version',
 +'sqlite-has-fts' => 'Shown on [[Special:Version]].
 +Parameters:
 +* $1 - version',
 +'sqlite-no-fts' => 'Shown on [[Special:Version]].
 +Parameters:
 +* $1 - version',
  
  # New logging system
 -'logentry-delete-delete' => '{{Logentry}}',
 -'logentry-delete-restore' => '{{Logentry}}',
 -'logentry-delete-event' => '{{Logentry}}
 +'logentry-delete-delete' => '{{Logentry|[[Special:Log/delete]]}}',
 +'logentry-delete-restore' => '{{Logentry|[[Special:Log/delete]]}}',
 +'logentry-delete-event' => '{{Logentry|[[Special:Log/delete]]}}
  {{Logentryparam}}
 -* $3 is the name of the log page inside parenthesis',
 -'logentry-delete-revision' => '{{Logentry}}
 +* $3 - the name of the log page inside parenthesis',
 +'logentry-delete-revision' => '{{Logentry|[[Special:Log/delete]]}}
  {{Logentryparam}}
 -* $5 is the number of affected revisions of the page $3.',
 -'logentry-delete-event-legacy' => '{{Logentry}}
 -$3 is the name of the log page inside parenthesis',
 -'logentry-delete-revision-legacy' => '{{Logentry}}',
 +* $5 - the number of affected revisions of the page $3.',
 +'logentry-delete-event-legacy' => '{{Logentry|[[Special:Log/delete]]}}
 +* $3 - the name of the log page inside parenthesis',
 +'logentry-delete-revision-legacy' => '{{Logentry|[[Special:Log/delete]]}}',
  'logentry-suppress-delete' => "{{Logentry}}
  
  'Hid' is a possible alternative to 'suppressed' in this message.",

diff --cc maintenance/language/messages.inc
Simple merge