From a879ccf6e80faf33ef536d7faeaad78b4938efec Mon Sep 17 00:00:00 2001
From: pupi1985 <pupi1985@bitbucket.org>
Date: Wed, 30 Jan 2019 01:59:06 -0300
Subject: [PATCH 01/12] Treat blob ids as strings due to size limitations

---
 qa-include/db/cache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa-include/db/cache.php b/qa-include/db/cache.php
index 0ee1abd95..4030571a9 100644
--- a/qa-include/db/cache.php
+++ b/qa-include/db/cache.php
@@ -44,7 +44,7 @@ function qa_db_cache_set($type, $cacheid, $content)
 	);
 
 	qa_db_query_sub(
-		'INSERT INTO ^cache (type, cacheid, content, created, lastread) VALUES ($, #, $, NOW(), NOW()) ' .
+		'INSERT INTO ^cache (type, cacheid, content, created, lastread) VALUES ($, $, $, NOW(), NOW()) ' .
 		'ON DUPLICATE KEY UPDATE content = VALUES(content), created = VALUES(created), lastread = VALUES(lastread)',
 		$type, $cacheid, $content
 	);

From 9e07a036b5c0d4a9d04d9bbf3ba2f1c3463faf74 Mon Sep 17 00:00:00 2001
From: pupi1985 <pupi1985@bitbucket.org>
Date: Thu, 31 Jan 2019 04:06:58 -0300
Subject: [PATCH 02/12] Fix negative upvoteCount wrongly displayed

---
 qa-include/app/format.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa-include/app/format.php b/qa-include/app/format.php
index b2f8acb9b..f59a4c3f3 100644
--- a/qa-include/app/format.php
+++ b/qa-include/app/format.php
@@ -495,7 +495,7 @@ function qa_post_html_fields($post, $userid, $cookieid, $usershtml, $dummy, $opt
 
 		// schema.org microdata - vote display might be formatted (e.g. '2k') so we use meta tag for true count
 		if ($microdata) {
-			$fields['netvotes_view']['suffix'] .= ' <meta itemprop="upvoteCount" content="' . qa_html($netvotes) . '"/>';
+			$fields['netvotes_view']['suffix'] .= ' <meta itemprop="upvoteCount" content="' . qa_html($upvotes - $downvotes) . '"/>';
 			$fields['upvotes_view']['suffix'] .= ' <meta itemprop="upvoteCount" content="' . qa_html($upvotes) . '"/>';
 		}
 

From 7ed3f6a077fd0ad7715ab307c7310f1760ae52a3 Mon Sep 17 00:00:00 2001
From: Scott <scott.vivian@gmail.com>
Date: Thu, 21 Mar 2019 18:38:10 +0000
Subject: [PATCH 03/12] Limit file input width

Fixes #544
---
 qa-theme/SnowFlat/qa-styles.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/qa-theme/SnowFlat/qa-styles.css b/qa-theme/SnowFlat/qa-styles.css
index e0dd0dbef..95ab65490 100644
--- a/qa-theme/SnowFlat/qa-styles.css
+++ b/qa-theme/SnowFlat/qa-styles.css
@@ -1812,6 +1812,16 @@ input[type="submit"], button {
 	cursor: pointer;
 	text-align: center;
 }
+@media (max-width: 479px) {
+	input[type="file"] {
+		max-width: 220px;
+	}
+}
+@media (max-width: 359px) {
+	input[type="file"] {
+		max-width: 180px;
+	}
+}
 
 [class^="qa-part-form"],
 [class^="qa-part-custom"] {

From 6e7176d20abfb322ef5976c03dd7dd6c22529793 Mon Sep 17 00:00:00 2001
From: pupi1985 <pupi1985@bitbucket.org>
Date: Thu, 2 May 2019 20:14:09 -0300
Subject: [PATCH 04/12] Prevent duplicated vote events

---
 qa-include/app/votes.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qa-include/app/votes.php b/qa-include/app/votes.php
index 420a3ffad..14f41c385 100644
--- a/qa-include/app/votes.php
+++ b/qa-include/app/votes.php
@@ -126,6 +126,10 @@ function qa_vote_set($post, $userid, $handle, $cookieid, $vote)
 	$vote = (int)min(1, max(-1, $vote));
 	$oldvote = (int)qa_db_uservote_get($post['postid'], $userid);
 
+	if ($oldvote === $vote) {
+		return;
+	}
+
 	qa_db_uservote_set($post['postid'], $userid, $vote);
 	qa_db_post_recount_votes($post['postid']);
 

From d92b3a9c07eb3500ed7d6dbec1cdf540704a563f Mon Sep 17 00:00:00 2001
From: pupi1985 <pupi1985@bitbucket.org>
Date: Sat, 11 May 2019 00:36:23 -0300
Subject: [PATCH 05/12] Fire u_delete_before event before deleting a user

---
 qa-include/pages/user-profile.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/qa-include/pages/user-profile.php b/qa-include/pages/user-profile.php
index 73a926467..d51af83e2 100644
--- a/qa-include/pages/user-profile.php
+++ b/qa-include/pages/user-profile.php
@@ -285,6 +285,11 @@
 				if (qa_clicked('dodelete') && ($loginlevel >= QA_USER_LEVEL_ADMIN)) {
 					require_once QA_INCLUDE_DIR . 'app/users-edit.php';
 
+					qa_report_event('u_delete_before', $loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), array(
+						'userid' => $userid,
+						'handle' => $useraccount['handle'],
+					));
+
 					qa_delete_user($userid);
 
 					qa_report_event('u_delete', $loginuserid, qa_get_logged_in_handle(), qa_cookie_get(), array(

From 188f5e98792f2aca3afdd8a03d88e5732c7f5685 Mon Sep 17 00:00:00 2001
From: Guillaume Turri <guillaume.turri@gmail.com>
Date: Mon, 4 May 2020 18:27:55 +0200
Subject: [PATCH 06/12] Prevent using <embed> and <object> tags

we don't really need them, do we?
---
 qa-include/qa-base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa-include/qa-base.php b/qa-include/qa-base.php
index 4a9f95125..f0a691de2 100644
--- a/qa-include/qa-base.php
+++ b/qa-include/qa-base.php
@@ -1024,7 +1024,7 @@ function qa_sanitize_html($html, $linksnewwindow = false, $storage = false)
 
 	$safe = htmLawed($html, array(
 		'safe' => 1,
-		'elements' => '*+embed+object-form',
+		'elements' => '*-form',
 		'schemes' => 'href: aim, feed, file, ftp, gopher, http, https, irc, mailto, news, nntp, sftp, ssh, telnet; *:file, http, https; style: !; classid:clsid',
 		'keep_bad' => 0,
 		'anti_link_spam' => array('/.*/', ''),

From e37b830d4b6ed81a029e5bb7819160cfdd23e1b5 Mon Sep 17 00:00:00 2001
From: Scott <scott.vivian@gmail.com>
Date: Wed, 6 May 2020 15:37:47 +0100
Subject: [PATCH 07/12] Avoid magic quotes deprecation notice on PHP 7.4

Fixes #786.
---
 qa-include/qa-base.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/qa-include/qa-base.php b/qa-include/qa-base.php
index f0a691de2..65b4a2ca7 100644
--- a/qa-include/qa-base.php
+++ b/qa-include/qa-base.php
@@ -1167,7 +1167,11 @@ function qa_gpc_to_string($string)
 {
 	if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
 
-	return get_magic_quotes_gpc() ? stripslashes($string) : $string;
+	// get_magic_quotes_gpc always returns false from PHP 5.4; this avoids deprecation notice on PHP 7.4+
+	if (qa_php_version_below('5.4.0'))
+		return get_magic_quotes_gpc() ? stripslashes($string) : $string;
+	else
+		return $string;
 }
 
 
@@ -1180,7 +1184,11 @@ function qa_string_to_gpc($string)
 {
 	if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
 
-	return get_magic_quotes_gpc() ? addslashes($string) : $string;
+	// get_magic_quotes_gpc always returns false from PHP 5.4; this avoids deprecation notice on PHP 7.4+
+	if (qa_php_version_below('5.4.0'))
+		return get_magic_quotes_gpc() ? addslashes($string) : $string;
+	else
+		return $string;
 }
 
 

From dc6ce3f0d97a0dd543ce86f124157f9cf6b3f125 Mon Sep 17 00:00:00 2001
From: Scott <scott.vivian@gmail.com>
Date: Thu, 7 May 2020 16:25:40 +0100
Subject: [PATCH 08/12] 1.8.4

---
 VERSION.txt            | 2 +-
 qa-include/qa-base.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index fe4e75fb7..7b378be30 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-1.8.3
\ No newline at end of file
+1.8.4
\ No newline at end of file
diff --git a/qa-include/qa-base.php b/qa-include/qa-base.php
index 65b4a2ca7..a06bbaeb0 100644
--- a/qa-include/qa-base.php
+++ b/qa-include/qa-base.php
@@ -20,8 +20,8 @@
 */
 
 
-define('QA_VERSION', '1.8.3'); // also used as suffix for .js and .css requests
-define('QA_BUILD_DATE', '2019-01-12');
+define('QA_VERSION', '1.8.4'); // also used as suffix for .js and .css requests
+define('QA_BUILD_DATE', '2020-05-07');
 
 
 /**

From efcc78ae28f32d86ed3d72cbad1dcac1028ac96f Mon Sep 17 00:00:00 2001
From: Benjamin Klaus <klaus@technikum-wien.at>
Date: Thu, 14 May 2020 12:24:00 +0200
Subject: [PATCH 09/12] extracted accessibility improvements from master of
 https://github.com/wbt-vienna/question2answer (part 1)

---
 .gitignore                         |  2 ++
 qa-content/qa-global.js            | 13 ++++++----
 qa-include/app/format.php          | 28 ++++++++++++---------
 qa-include/app/page.php            |  1 +
 qa-include/pages/ask.php           |  2 ++
 qa-include/pages/feedback.php      |  7 ++++--
 qa-include/pages/forgot.php        |  1 +
 qa-include/pages/login.php         |  9 ++++---
 qa-include/pages/question-post.php | 17 +++++++++----
 qa-include/pages/question-view.php | 25 ++++++++++++-------
 qa-include/pages/register.php      |  3 +++
 qa-include/qa-theme-base.php       | 39 ++++++++++++++++--------------
 12 files changed, 94 insertions(+), 53 deletions(-)

diff --git a/.gitignore b/.gitignore
index ecc5ae578..58bf25168 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 ehthumbs.db
 Thumbs.db
 .idea/
+
+*.iml
diff --git a/qa-content/qa-global.js b/qa-content/qa-global.js
index 6d3f3a0fc..3f304a438 100644
--- a/qa-content/qa-global.js
+++ b/qa-content/qa-global.js
@@ -95,9 +95,12 @@ function qa_vote_click(elem)
 					mess = document.createElement('div');
 					mess.id = 'errorbox';
 					mess.className = 'qa-error';
-					mess.innerHTML = lines[1];
 					mess.style.display = 'none';
+					mess.role = 'alert';
+					mess.innerHTML = lines[1];
 				}
+				mess.setAttribute('role', 'alert');
+				elem.setAttribute('aria-describedby', mess.id);
 
 				var postelem = document.getElementById(anchor);
 				var e = postelem.parentNode.insertBefore(mess, postelem);
@@ -194,19 +197,19 @@ function qa_display_rule_show(target, show, first)
 
 var qa_element_revealed = null;
 
-function qa_toggle_element(elem)
+function qa_toggle_element(elem, dontClose)
 {
 	var e = elem ? document.getElementById(elem) : null;
 
 	if (e && e.qa_disabled)
 		e = null;
 
-	if (e && (qa_element_revealed == e)) {
+	if (e && (qa_element_revealed === e) && !dontClose) {
 		qa_conceal(qa_element_revealed, 'form');
 		qa_element_revealed = null;
 
 	} else {
-		if (qa_element_revealed)
+		if (qa_element_revealed !== e)
 			qa_conceal(qa_element_revealed, 'form');
 
 		if (e) {
@@ -431,7 +434,7 @@ function qa_form_params(formname)
 		var e = es[i];
 		var t = (e.type || '').toLowerCase();
 
-		if (((t != 'checkbox') && (t != 'radio')) || e.checked)
+		if (((t != 'checkbox') && (t != 'radio')) || (e && e.checked))
 			params[e.name] = e.value;
 	}
 
diff --git a/qa-include/app/format.php b/qa-include/app/format.php
index f59a4c3f3..1d4af5ec3 100644
--- a/qa-include/app/format.php
+++ b/qa-include/app/format.php
@@ -426,7 +426,7 @@ function qa_post_html_fields($post, $userid, $cookieid, $usershtml, $dummy, $opt
 
 		// this is for backwards compatibility with any existing links using the old style of anchor
 		// that contained the post id only (changed to be valid under W3C specifications)
-		$fields['content'] = '<a name="' . qa_html($postid) . '"></a>' . $fields['content'];
+		$fields['content'] = '<a aria-hidden="true" name="' . qa_html($postid) . '"></a>' . $fields['content'];
 	}
 
 	// Voting stuff
@@ -542,7 +542,8 @@ function qa_post_html_fields($post, $userid, $cookieid, $usershtml, $dummy, $opt
 			$fields['vote_down_tags'] = 'title="' . qa_lang_html('main/voted_down_popup') . '" name="' . qa_html('vote_' . $postid . '_0_' . $elementid) . '" ' . $onclick;
 
 		} else {
-			$fields['vote_up_tags'] = 'title="' . qa_lang_html('main/vote_up_popup') . '" name="' . qa_html('vote_' . $postid . '_1_' . $elementid) . '" ' . $onclick;
+            $title = $fields['raw']['type'] == "Q" ? qa_lang_html('main/vote_up_popup_question') : qa_lang_html('main/vote_up_popup_answer');
+		    $fields['vote_up_tags'] = 'title="' . $title . '" name="' . qa_html('vote_' . $postid . '_1_' . $elementid) . '" ' . $onclick;
 
 			if (strpos($voteview, '-uponly-level')) {
 				$fields['vote_state'] = 'up_only';
@@ -553,8 +554,9 @@ function qa_post_html_fields($post, $userid, $cookieid, $usershtml, $dummy, $opt
 				$fields['vote_down_tags'] = 'title="' . qa_lang_html('main/vote_disabled_down_approve') . '"';
 
 			} else {
-				$fields['vote_state'] = 'enabled';
-				$fields['vote_down_tags'] = 'title="' . qa_lang_html('main/vote_down_popup') . '" name="' . qa_html('vote_' . $postid . '_-1_' . $elementid) . '" ' . $onclick;
+				$title = $fields['raw']['type'] == "Q" ? qa_lang_html('main/vote_down_popup_question') : qa_lang_html('main/vote_down_popup_answer');
+			    $fields['vote_state'] = 'enabled';
+				$fields['vote_down_tags'] = 'title="' . $title . '" name="' . qa_html('vote_' . $postid . '_-1_' . $elementid) . '" ' . $onclick;
 			}
 		}
 	}
@@ -1867,8 +1869,9 @@ function qa_set_up_name_field(&$qa_content, &$fields, $inname, $fieldprefix = ''
 {
 	$fields['name'] = array(
 		'label' => qa_lang_html('question/anon_name_label'),
-		'tags' => 'name="' . $fieldprefix . 'name"',
+		'tags' => 'name="' . $fieldprefix . 'name" id="' .$fieldprefix . 'inputNameAnon"',
 		'value' => qa_html($inname),
+        'id' =>  $fieldprefix . 'inputNameAnon'
 	);
 }
 
@@ -1889,10 +1892,12 @@ function qa_set_up_name_field(&$qa_content, &$fields, $inname, $fieldprefix = ''
  */
 function qa_set_up_notify_fields(&$qa_content, &$fields, $basetype, $login_email, $innotify, $inemail, $errors_email, $fieldprefix = '')
 {
-	$fields['notify'] = array(
-		'tags' => 'name="' . $fieldprefix . 'notify"',
+
+    $fields['notify'] = array(
+		'tags' => 'name="' . $fieldprefix . 'notify" id="' . $fieldprefix .'notify"',
 		'type' => 'checkbox',
 		'value' => qa_html($innotify),
+        'id' => $fieldprefix.'notify'
 	);
 
 	switch ($basetype) {
@@ -1920,19 +1925,20 @@ function qa_set_up_notify_fields(&$qa_content, &$fields, $basetype, $login_email
 			'<span id="' . $fieldprefix . 'email_shown">' . $labelaskemail . '</span>' .
 			'<span id="' . $fieldprefix . 'email_hidden" style="display:none;">' . $labelonly . '</span>';
 
-		$fields['notify']['tags'] .= ' id="' . $fieldprefix . 'notify" onclick="if (document.getElementById(\'' . $fieldprefix . 'notify\').checked) document.getElementById(\'' . $fieldprefix . 'email\').focus();"';
+		$fields['notify']['tags'] .= ' id="' . $fieldprefix . 'notify" onclick="if (document.getElementById(\'' . $fieldprefix . 'notify\').checked) document.getElementById(\'' . $fieldprefix . 'email_display\').focus();"';
 		$fields['notify']['tight'] = true;
 
 		$fields['email'] = array(
-			'id' => $fieldprefix . 'email_display',
-			'tags' => 'name="' . $fieldprefix . 'email" id="' . $fieldprefix . 'email"',
+			'label' => qa_lang_html('main/email_optional'),
+		    'id' => $fieldprefix . 'email_display',
+			'tags' => 'name="' . $fieldprefix . 'email" id="' . $fieldprefix . 'email_display"',
 			'value' => qa_html($inemail),
 			'note' => qa_lang_html('question/notify_email_note'),
 			'error' => qa_html($errors_email),
 		);
 
 		qa_set_display_rules($qa_content, array(
-			$fieldprefix . 'email_display' => $fieldprefix . 'notify',
+			$fieldprefix . 'email_display-tbody' => $fieldprefix . 'notify',
 			$fieldprefix . 'email_shown' => $fieldprefix . 'notify',
 			$fieldprefix . 'email_hidden' => '!' . $fieldprefix . 'notify',
 		));
diff --git a/qa-include/app/page.php b/qa-include/app/page.php
index ce6bc767e..80db415f4 100644
--- a/qa-include/app/page.php
+++ b/qa-include/app/page.php
@@ -517,6 +517,7 @@ function qa_content_prepare($voting = false, $categoryids = array())
 				'feedback' => array(
 					'url' => qa_path_html('feedback'),
 					'label' => qa_lang_html('main/nav_feedback'),
+                    'role' => 'link'
 				),
 			),
 
diff --git a/qa-include/pages/ask.php b/qa-include/pages/ask.php
index 4f11c2438..374d2b2ff 100644
--- a/qa-include/pages/ask.php
+++ b/qa-include/pages/ask.php
@@ -189,6 +189,7 @@
 $field = qa_editor_load_field($editor, $qa_content, @$in['content'], @$in['format'], 'content', 12, false);
 $field['label'] = qa_lang_html('question/q_content_label');
 $field['error'] = qa_html(@$errors['content']);
+$field['id'] = 'content';
 
 $custom = qa_opt('show_custom_ask') ? trim(qa_opt('custom_ask')) : '';
 
@@ -208,6 +209,7 @@
 			'tags' => 'name="title" id="title" autocomplete="off"',
 			'value' => qa_html(@$in['title']),
 			'error' => qa_html(@$errors['title']),
+            'id' => 'title'
 		),
 
 		'similar' => array(
diff --git a/qa-include/pages/feedback.php b/qa-include/pages/feedback.php
index 477b237d7..2916f8e5b 100644
--- a/qa-include/pages/feedback.php
+++ b/qa-include/pages/feedback.php
@@ -138,21 +138,24 @@
 			'value' => qa_html(@$inmessage),
 			'rows' => 8,
 			'error' => qa_html(@$errors['message']),
+            'id' => 'message'
 		),
 
 		'name' => array(
 			'type' => $feedbacksent ? 'static' : '',
 			'label' => qa_lang_html('misc/feedback_name'),
-			'tags' => 'name="name"',
+			'tags' => 'name="name" id="nameInput"',
 			'value' => qa_html(isset($inname) ? $inname : @$userprofile['name']),
+            'id' => 'nameInput'
 		),
 
 		'email' => array(
 			'type' => $feedbacksent ? 'static' : '',
 			'label' => qa_lang_html('misc/feedback_email'),
-			'tags' => 'name="email"',
+			'tags' => 'name="email" id="emailInput"',
 			'value' => qa_html(isset($inemail) ? $inemail : qa_get_logged_in_email()),
 			'note' => $feedbacksent ? null : qa_opt('email_privacy'),
+            'id' => 'emailInput'
 		),
 	),
 
diff --git a/qa-include/pages/forgot.php b/qa-include/pages/forgot.php
index 9b1ce5b23..c606dbfe8 100644
--- a/qa-include/pages/forgot.php
+++ b/qa-include/pages/forgot.php
@@ -94,6 +94,7 @@
 			'value' => qa_html(@$inemailhandle),
 			'error' => qa_html(@$errors['emailhandle']),
 			'note' => qa_lang_html('users/send_reset_note'),
+            'id' => 'emailhandle'
 		),
 	),
 
diff --git a/qa-include/pages/login.php b/qa-include/pages/login.php
index 0a8582656..0ad6532e6 100644
--- a/qa-include/pages/login.php
+++ b/qa-include/pages/login.php
@@ -151,25 +151,28 @@
 	'fields' => array(
 		'email_handle' => array(
 			'label' => qa_opt('allow_login_email_only') ? qa_lang_html('users/email_label') : qa_lang_html('users/email_handle_label'),
-			'tags' => 'name="emailhandle" id="emailhandle" dir="auto"',
+			'tags' => 'name="emailhandle" id="emailhandle" dir="auto" autocomplete="username"',
 			'value' => qa_html(@$inemailhandle),
 			'error' => qa_html(@$errors['emailhandle']),
+            'id' => 'emailhandle'
 		),
 
 		'password' => array(
 			'type' => 'password',
 			'label' => qa_lang_html('users/password_label'),
-			'tags' => 'name="password" id="password" dir="auto"',
+			'tags' => 'name="password" id="password" dir="auto" autocomplete="current-password"',
 			'value' => qa_html(@$inpassword),
 			'error' => empty($errors['password']) ? '' : (qa_html(@$errors['password']) . ' - ' . $forgothtml),
 			'note' => $passwordsent ? qa_lang_html('users/password_sent') : $forgothtml,
+            'id' => 'password'
 		),
 
 		'remember' => array(
 			'type' => 'checkbox',
 			'label' => qa_lang_html('users/remember_label'),
-			'tags' => 'name="remember"',
+			'tags' => 'name="remember" id="rememberInput"',
 			'value' => !empty($inremember),
+            'id' => 'rememberInput'
 		),
 	),
 
diff --git a/qa-include/pages/question-post.php b/qa-include/pages/question-post.php
index 801be44c9..6e708ab1d 100644
--- a/qa-include/pages/question-post.php
+++ b/qa-include/pages/question-post.php
@@ -309,9 +309,10 @@ function qa_page_q_edit_q_form(&$qa_content, $question, $in, $errors, $completet
 			'title' => array(
 				'type' => $question['editable'] ? 'text' : 'static',
 				'label' => qa_lang_html('question/q_title_label'),
-				'tags' => 'name="q_title"',
+				'tags' => 'name="q_title" id="q_title"',
 				'value' => qa_html(($question['editable'] && isset($in['title'])) ? $in['title'] : $question['title']),
 				'error' => qa_html(@$errors['title']),
+                'id' => 'q_title'
 			),
 
 			'category' => array(
@@ -322,6 +323,8 @@ function qa_page_q_edit_q_form(&$qa_content, $question, $in, $errors, $completet
 			'content' => array(
 				'label' => qa_lang_html('question/q_content_label'),
 				'error' => qa_html(@$errors['content']),
+                'tags' => 'name="q_content" id="q_content"',
+                'id' => 'q_content'
 			),
 
 			'extra' => array(
@@ -404,8 +407,9 @@ function qa_page_q_edit_q_form(&$qa_content, $question, $in, $errors, $completet
 		$form['fields']['silent'] = array(
 			'type' => 'checkbox',
 			'label' => qa_lang_html('question/save_silent_label'),
-			'tags' => 'name="q_silent"',
+			'tags' => 'name="q_silent" id="q_silent"',
 			'value' => qa_html(@$in['silent']),
+            'id' => 'q_silent'
 		);
 	}
 
@@ -711,10 +715,11 @@ function qa_page_q_edit_a_form(&$qa_content, $id, $answer, $question, $answers,
 				'<span id="' . $prefix . 'tohidden" style="display:none;">' . qa_lang_html('question/a_convert_to_c') . '</span>',
 			'type' => 'checkbox',
 			'tight' => true,
+            'id' => $prefix . 'dotoc'
 		);
 
 		$form['fields']['commenton'] = array(
-			'tags' => 'name="' . $prefix . 'commenton"',
+			'tags' => 'name="' . $prefix . 'commenton" id="' . $prefix . 'commenton"',
 			'id' => $prefix . 'commenton',
 			'type' => 'select',
 			'note' => qa_lang_html($hascomments ? 'question/a_convert_warn_cs' : 'question/a_convert_warn'),
@@ -744,8 +749,9 @@ function qa_page_q_edit_a_form(&$qa_content, $id, $answer, $question, $answers,
 		$form['fields']['silent'] = array(
 			'type' => 'checkbox',
 			'label' => qa_lang_html('question/save_silent_label'),
-			'tags' => 'name="' . $prefix . 'silent"',
+			'tags' => 'name="' . $prefix . 'silent" id="' . $prefix . '_silent"',
 			'value' => qa_html(@$in['silent']),
+            'id' => $prefix . '_silent'
 		);
 	}
 
@@ -951,8 +957,9 @@ function qa_page_q_edit_c_form(&$qa_content, $id, $comment, $in, $errors)
 		$form['fields']['silent'] = array(
 			'type' => 'checkbox',
 			'label' => qa_lang_html('question/save_silent_label'),
-			'tags' => 'name="' . $prefix . 'silent"',
+			'tags' => 'name="' . $prefix . 'silent" id="' . $prefix . '_silent"',
 			'value' => qa_html(@$in['silent']),
+            'id' => $prefix . '_silent'
 		);
 	}
 
diff --git a/qa-include/pages/question-view.php b/qa-include/pages/question-view.php
index 0f5940933..904d976a0 100644
--- a/qa-include/pages/question-view.php
+++ b/qa-include/pages/question-view.php
@@ -395,7 +395,7 @@ function qa_page_q_question_view($question, $parentquestion, $closepost, $usersh
 		if ($question['answerbutton']) {
 			// don't show if shown by default
 			$buttons['answer'] = array(
-				'tags' => 'name="q_doanswer" id="q_doanswer" onclick="return qa_toggle_element(\'anew\')"',
+				'tags' => 'name="q_doanswer" id="q_doanswer" onclick="return qa_toggle_element(\'anew\', true)"',
 				'label' => qa_lang_html('question/answer_button'),
 				'popup' => qa_lang_html('question/answer_q_popup'),
 			);
@@ -403,7 +403,7 @@ function qa_page_q_question_view($question, $parentquestion, $closepost, $usersh
 
 		if ($question['commentbutton']) {
 			$buttons['comment'] = array(
-				'tags' => 'name="q_docomment" onclick="return qa_toggle_element(\'c' . $questionid . '\')"',
+				'tags' => 'name="q_docomment" onclick="return qa_toggle_element(\'c' . $questionid . '\', true)"',
 				'label' => qa_lang_html('question/comment_button'),
 				'popup' => qa_lang_html('question/comment_q_popup'),
 			);
@@ -617,7 +617,7 @@ function qa_page_q_answer_view($question, $answer, $isselected, $usershtml, $for
 
 		if ($answer['commentbutton']) {
 			$buttons['comment'] = array(
-				'tags' => 'name="' . $prefix . 'docomment" onclick="return qa_toggle_element(\'c' . $answerid . '\')"',
+				'tags' => 'name="' . $prefix . 'docomment" onclick="return qa_toggle_element(\'c' . $answerid . '\', true)"',
 				'label' => qa_lang_html('question/comment_button'),
 				'popup' => qa_lang_html('question/comment_a_popup'),
 			);
@@ -755,7 +755,7 @@ function qa_page_q_comment_view($question, $parent, $comment, $usershtml, $formr
 		if ($parent['commentbutton'] && qa_opt('show_c_reply_buttons') && $comment['type'] == 'C') {
 			$buttons['comment'] = array(
 				'tags' => 'name="' . (($parent['basetype'] == 'Q') ? 'q' : ('a' . qa_html($parent['postid']))) .
-					'_docomment" onclick="return qa_toggle_element(\'c' . qa_html($parent['postid']) . '\')"',
+					'_docomment" onclick="return qa_toggle_element(\'c' . qa_html($parent['postid']) . '\', true)"',
 				'label' => qa_lang_html('question/reply_button'),
 				'popup' => qa_lang_html('question/reply_c_popup'),
 			);
@@ -935,8 +935,6 @@ function qa_page_q_add_a_form(&$qa_content, $formid, $captchareason, $question,
 			$form = array(
 				'tags' => 'method="post" action="' . qa_self_html() . '" name="a_form"',
 
-				'title' => qa_lang_html('question/your_answer_title'),
-
 				'fields' => array(
 					'custom' => array(
 						'type' => 'custom',
@@ -947,7 +945,11 @@ function qa_page_q_add_a_form(&$qa_content, $formid, $captchareason, $question,
 						qa_editor_load_field($editor, $qa_content, @$in['content'], @$in['format'], 'a_content', 12, $formrequested, $loadnow),
 						array(
 							'error' => qa_html(@$errors['content']),
-						)
+						),
+                        [
+                            'label' => qa_lang_html('question/your_answer_title'),
+                            'id' => 'a_content'
+                        ]
 					),
 				),
 
@@ -1083,10 +1085,11 @@ function qa_page_q_add_c_form(&$qa_content, $question, $parent, $formid, $captch
 
 			$custom = qa_opt('show_custom_comment') ? trim(qa_opt('custom_comment')) : '';
 
+            $label = qa_lang_html(($question['postid'] == $parent['postid']) ? 'question/your_comment_q' : 'question/your_comment_a');
 			$form = array(
 				'tags' => 'method="post" action="' . qa_self_html() . '" name="c_form_' . qa_html($parent['postid']) . '"',
 
-				'title' => qa_lang_html(($question['postid'] == $parent['postid']) ? 'question/your_comment_q' : 'question/your_comment_a'),
+
 
 				'fields' => array(
 					'custom' => array(
@@ -1098,7 +1101,11 @@ function qa_page_q_add_c_form(&$qa_content, $question, $parent, $formid, $captch
 						qa_editor_load_field($editor, $qa_content, @$in['content'], @$in['format'], $prefix . 'content', 4, $loadfocusnow, $loadfocusnow),
 						array(
 							'error' => qa_html(@$errors['content']),
-						)
+						),
+                        [
+                            'label' => $label,
+                            'id' => $prefix . 'content'
+                        ]
 					),
 				),
 
diff --git a/qa-include/pages/register.php b/qa-include/pages/register.php
index dacde6c39..e0ba230fe 100644
--- a/qa-include/pages/register.php
+++ b/qa-include/pages/register.php
@@ -158,6 +158,7 @@
 			'tags' => 'name="handle" id="handle" dir="auto"',
 			'value' => qa_html(@$inhandle),
 			'error' => qa_html(@$errors['handle']),
+            'id' => 'handle'
 		),
 
 		'password' => array(
@@ -166,6 +167,7 @@
 			'tags' => 'name="password" id="password" dir="auto"',
 			'value' => qa_html(@$inpassword),
 			'error' => qa_html(@$errors['password']),
+            'id' => 'password'
 		),
 
 		'email' => array(
@@ -174,6 +176,7 @@
 			'value' => qa_html(@$inemail),
 			'note' => qa_opt('email_privacy'),
 			'error' => qa_html(@$errors['email']),
+            'id' => 'email'
 		),
 	),
 
diff --git a/qa-include/qa-theme-base.php b/qa-include/qa-theme-base.php
index 9069b7406..49f4052e9 100644
--- a/qa-include/qa-theme-base.php
+++ b/qa-include/qa-theme-base.php
@@ -156,7 +156,7 @@ public function output_split($parts, $class, $outertag = 'span', $innertag = 'sp
 			return;
 
 		$this->output(
-			'<' . $outertag . ' class="' . $class . (isset($extraclass) ? (' ' . $extraclass) : '') . '">',
+			'<' . $outertag . ' class="' . $class . (isset($extraclass) ? (' ' . $extraclass) : '') . '"' . (isset($parts['aria-hidden']) ? 'aria-hidden="true"' : '') . '>',
 			(strlen(@$parts['prefix']) ? ('<' . $innertag . ' class="' . $class . '-pad">' . $parts['prefix'] . '</' . $innertag . '>') : '') .
 			(strlen(@$parts['data']) ? ('<' . $innertag . ' class="' . $class . '-data">' . $parts['data'] . '</' . $innertag . '>') : '') .
 			(strlen(@$parts['suffix']) ? ('<' . $innertag . ' class="' . $class . '-pad">' . $parts['suffix'] . '</' . $innertag . '>') : ''),
@@ -566,12 +566,12 @@ public function search_button($search)
 		$this->output('<input type="submit" value="' . $search['button_label'] . '" class="qa-search-button"/>');
 	}
 
-	public function nav($navtype, $level = null)
+	public function nav($navtype, $level = null, $ariaLabel = "")
 	{
 		$navigation = @$this->content['navigation'][$navtype];
 
 		if ($navtype == 'user' || isset($navigation)) {
-			$this->output('<div class="qa-nav-' . $navtype . '">');
+			$this->output('<nav class="qa-nav-' . $navtype . '" aria-label="' . $ariaLabel . '">');
 
 			if ($navtype == 'user')
 				$this->logged_in();
@@ -589,13 +589,17 @@ public function nav($navtype, $level = null)
 			$this->nav_clear($navtype);
 			$this->clear_context('nav_type');
 
-			$this->output('</div>');
+			$this->output('</nav>');
 		}
 	}
 
 	public function nav_list($navigation, $class, $level = null)
 	{
-		$this->output('<ul class="qa-' . $class . '-list' . (isset($level) ? (' qa-' . $class . '-list-' . $level) : '') . '">');
+        $role = 'role="tablist"';
+	    foreach ($navigation as $key => $navlink) {
+            $role = isset($navlink['role']) ? 'role="presentation"' : $role;
+        }
+	    $this->output('<ul ' . $role . ' class="qa-' . $class . '-list' . (isset($level) ? (' qa-' . $class . '-list-' . $level) : '') . '">');
 
 		$index = 0;
 
@@ -626,8 +630,9 @@ public function nav_item($key, $navlink, $class, $level = null)
 			'/' => '-',
 		));
 
-		$this->output('<li class="qa-' . $class . '-item' . (@$navlink['opposite'] ? '-opp' : '') .
-			(@$navlink['state'] ? (' qa-' . $class . '-' . $navlink['state']) : '') . ' qa-' . $class . '-' . $suffix . '">');
+        $role = isset($navlink['role']) ? $navlink['role'] : 'tab';
+		$this->output('<li role="' . $role . '" class="qa-' . $class . '-item' . (@$navlink['opposite'] ? '-opp' : '') .
+			(@$navlink['state'] ? (' qa-' . $class . '-' . $navlink['state']) : '') . ' qa-' . $class . '-' . $suffix . '" ' . ((@$navlink['selected'] && $role == 'tab') ? (' aria-selected="true"') : '') . '>');
 		$this->nav_link($navlink, $class);
 
 		$subnav = isset($navlink['subnav']) ? $navlink['subnav'] : array();
@@ -715,7 +720,7 @@ public function main()
 		$content = $this->content;
 		$hidden = !empty($content['hidden']) ? ' qa-main-hidden' : '';
 
-		$this->output('<div class="qa-main' . $hidden . '">');
+		$this->output('<main class="qa-main' . $hidden . '">');
 
 		$this->widgets('main', 'top');
 
@@ -732,7 +737,7 @@ public function main()
 
 		$this->widgets('main', 'bottom');
 
-		$this->output('</div> <!-- END qa-main -->', '');
+		$this->output('</main> <!-- END qa-main -->', '');
 	}
 
 	public function page_title_error()
@@ -911,7 +916,7 @@ public function attribution()
 		// Hi there. I'd really appreciate you displaying this link on your Q2A site. Thank you - Gideon
 
 		$this->output(
-			'<div class="qa-attribution">',
+			'<div class="qa-attribution" lang="en">',
 			'Powered by <a href="http://www.question2answer.org/">Question2Answer</a>',
 			'</div>'
 		);
@@ -986,7 +991,7 @@ public function form_body($form)
 		$columns = $this->form_columns($form);
 
 		if ($columns)
-			$this->output('<table class="qa-form-' . $form['style'] . '-table">');
+			$this->output('<table role="presentation" class="qa-form-' . $form['style'] . '-table">');
 
 		$this->form_ok($form, $columns);
 		$this->form_fields($form, $columns);
@@ -1065,9 +1070,9 @@ public function form_field_rows($form, $columns, $field)
 
 		if (isset($field['id'])) {
 			if ($columns == 1)
-				$this->output('<tbody id="' . $field['id'] . '">', '<tr>');
+				$this->output('<tbody id="' . $field['id'] . '-tbody">', '<tr>');
 			else
-				$this->output('<tr id="' . $field['id'] . '">');
+				$this->output('<tr id="' . $field['id'] . '-tr">');
 		} else
 			$this->output('<tr>');
 
@@ -1102,15 +1107,13 @@ public function form_label($field, $style, $columns, $prefixed, $suffixed, $cols
 
 		$this->output('<td class="qa-form-' . $style . '-label"' . $extratags . '>');
 
-		if ($prefixed) {
-			$this->output('<label>');
+        $this->output('<label for="' . @$field['id'] . '">');
+        if ($prefixed) {
 			$this->form_field($field, $style);
 		}
 
 		$this->output(@$field['label']);
-
-		if ($prefixed)
-			$this->output('</label>');
+        $this->output('</label>');
 
 		if ($suffixed) {
 			$this->output('&nbsp;');

From 64a197f17742a8d5f4d5962a3eeffe70193fbc2d Mon Sep 17 00:00:00 2001
From: Benjamin Klaus <klaus@technikum-wien.at>
Date: Thu, 14 May 2020 12:35:00 +0200
Subject: [PATCH 10/12] extracted accessibility improvements from master of
 https://github.com/wbt-vienna/question2answer (part 2)

---
 qa-include/qa-theme-base.php   | 41 +++++++++++++++++++---------------
 qa-theme/SnowFlat/qa-theme.php | 17 +++++++-------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/qa-include/qa-theme-base.php b/qa-include/qa-theme-base.php
index 49f4052e9..6312c4421 100644
--- a/qa-include/qa-theme-base.php
+++ b/qa-include/qa-theme-base.php
@@ -1392,7 +1392,7 @@ public function form_error($field, $style, $columns)
 	{
 		$tag = ($columns > 1) ? 'span' : 'div';
 
-		$this->output('<' . $tag . ' class="qa-form-' . $style . '-error">' . $field['error'] . '</' . $tag . '>');
+		$this->output('<' . $tag . ' role="alert" aria-describedby="' . $field['id'] . '" class="qa-form-' . $style . '-error">' . $field['error'] . '</' . $tag . '>');
 	}
 
 	public function form_note($field, $style, $columns)
@@ -1656,9 +1656,9 @@ public function q_list_form($q_list)
 	public function q_list($q_list)
 	{
 		if (isset($q_list['qs'])) {
-			$this->output('<div class="qa-q-list' . ($this->list_vote_disabled($q_list['qs']) ? ' qa-q-list-vote-disabled' : '') . '">', '');
+			$this->output('<ol class="qa-q-list' . ($this->list_vote_disabled($q_list['qs']) ? ' qa-q-list-vote-disabled' : '') . '" aria-label="' . qa_lang_html('main/x_questions') . '" style="list-style-type:none;">', '');
 			$this->q_list_items($q_list['qs']);
-			$this->output('</div> <!-- END qa-q-list -->', '');
+			$this->output('</ol> <!-- END qa-q-list -->', '');
 		}
 	}
 
@@ -1692,7 +1692,7 @@ public function q_item_stats($q_item)
 
 	public function q_item_main($q_item)
 	{
-		$this->output('<div class="qa-q-item-main">');
+		$this->output('<article class="qa-q-item-main">');
 
 		$this->view_count($q_item);
 		$this->q_item_title($q_item);
@@ -1702,7 +1702,7 @@ public function q_item_main($q_item)
 		$this->post_tags($q_item, 'qa-q-item');
 		$this->q_item_buttons($q_item);
 
-		$this->output('</div>');
+		$this->output('</article>');
 	}
 
 	public function q_item_clear()
@@ -1809,7 +1809,11 @@ public function vote_count($post)
 			$this->output_split($post['upvotes_view'], 'qa-upvote-count');
 			$this->output_split($post['downvotes_view'], 'qa-downvote-count');
 		} else {
-			$this->output_split($post['netvotes_view'], 'qa-netvote-count');
+            $post['netvotes_view']['prefix'] = '<span class="sr-only">' . qa_lang_html('main/netvote_of_question') . '</span>';
+		    if ($post['raw']['netvotes'] < 0) {
+                $post['netvotes_view']['prefix'] .= '<span class="sr-only"> minus </span>';
+            }
+		    $this->output_split($post['netvotes_view'], 'qa-netvote-count');
 		}
 
 		$this->output('</div>');
@@ -1998,7 +2002,8 @@ public function post_meta_who($post, $class)
 			// You can also use $post['level'] to get the author's privilege level (as a string)
 
 			if (isset($post['who']['points'])) {
-				$post['who']['points']['prefix'] = '(' . $post['who']['points']['prefix'];
+                $post['who']['points']['aria-hidden'] = true;
+			    $post['who']['points']['prefix'] = '(' . $post['who']['points']['prefix'];
 				$post['who']['points']['suffix'] .= ')';
 				$this->output_split($post['who']['points'], $class . '-who-points');
 			}
@@ -2026,9 +2031,9 @@ public function post_tags($post, $class)
 
 	public function post_tag_list($post, $class)
 	{
-		$this->output('<ul class="' . $class . '-tag-list">');
-
-		foreach ($post['q_tags'] as $taghtml) {
+        $this->output('<label for="taglist" id="taglistLabel" class="sr-only">' . qa_lang_html('main/list_of') . ' <span lang="en">' . qa_lang_html('main/nav_tags') . '</span></label>');
+        $this->output('<ul id="taglist" aria-labelledby="taglistLabel" class="' . $class . '-tag-list">');
+        foreach ($post['q_tags'] as $taghtml) {
 			$this->post_tag_item($taghtml, $class);
 		}
 
@@ -2280,9 +2285,9 @@ public function a_list($a_list)
 		if (!empty($a_list)) {
 			$this->part_title($a_list);
 
-			$this->output('<div class="qa-a-list' . ($this->list_vote_disabled($a_list['as']) ? ' qa-a-list-vote-disabled' : '') . '" ' . @$a_list['tags'] . '>', '');
+			$this->output('<ol aria-label="' . qa_lang_html('question/answer_button') . '" class="qa-a-list' . ($this->list_vote_disabled($a_list['as']) ? ' qa-a-list-vote-disabled' : '') . '" ' . @$a_list['tags'] . '>', '');
 			$this->a_list_items($a_list['as']);
-			$this->output('</div> <!-- END qa-a-list -->', '');
+			$this->output('</ol> <!-- END qa-a-list -->', '');
 		}
 	}
 
@@ -2297,7 +2302,7 @@ public function a_list_item($a_item)
 	{
 		$extraclass = @$a_item['classes'] . ($a_item['hidden'] ? ' qa-a-list-item-hidden' : ($a_item['selected'] ? ' qa-a-list-item-selected' : ''));
 
-		$this->output('<div class="qa-a-list-item ' . $extraclass . '" ' . @$a_item['tags'] . '>');
+		$this->output('<li class="qa-a-list-item ' . $extraclass . '" ' . @$a_item['tags'] . '>');
 
 		if (isset($a_item['main_form_tags'])) {
 			$this->output('<form ' . $a_item['main_form_tags'] . '>'); // form for answer voting buttons
@@ -2313,7 +2318,7 @@ public function a_list_item($a_item)
 		$this->a_item_main($a_item);
 		$this->a_item_clear();
 
-		$this->output('</div> <!-- END qa-a-list-item -->', '');
+		$this->output('</li> <!-- END qa-a-list-item -->', '');
 	}
 
 	public function a_item_main($a_item)
@@ -2391,9 +2396,9 @@ public function c_form($c_form)
 	public function c_list($c_list, $class)
 	{
 		if (!empty($c_list)) {
-			$this->output('', '<div class="' . $class . '-c-list"' . (@$c_list['hidden'] ? ' style="display:none;"' : '') . ' ' . @$c_list['tags'] . '>');
+			$this->output('', '<ol aria-label="' . qa_lang_html('question/comments') . '" class="' . $class . '-c-list"' . (@$c_list['hidden'] ? ' style="display:none;"' : '') . ' ' . @$c_list['tags'] . '>');
 			$this->c_list_items($c_list['cs']);
-			$this->output('</div> <!-- END qa-c-list -->', '');
+			$this->output('</ol> <!-- END qa-c-list -->', '');
 		}
 	}
 
@@ -2408,7 +2413,7 @@ public function c_list_item($c_item)
 	{
 		$extraclass = @$c_item['classes'] . (@$c_item['hidden'] ? ' qa-c-item-hidden' : '');
 
-		$this->output('<div class="qa-c-list-item ' . $extraclass . '" ' . @$c_item['tags'] . '>');
+		$this->output('<li class="qa-c-list-item ' . $extraclass . '" ' . @$c_item['tags'] . '>');
 
 		if (isset($c_item['vote_view']) && isset($c_item['main_form_tags'])) {
 			// form for comment voting buttons
@@ -2421,7 +2426,7 @@ public function c_list_item($c_item)
 		$this->c_item_main($c_item);
 		$this->c_item_clear();
 
-		$this->output('</div> <!-- END qa-c-item -->');
+		$this->output('</li> <!-- END qa-c-item -->');
 	}
 
 	public function c_item_main($c_item)
diff --git a/qa-theme/SnowFlat/qa-theme.php b/qa-theme/SnowFlat/qa-theme.php
index 921768b79..6e3fc573b 100644
--- a/qa-theme/SnowFlat/qa-theme.php
+++ b/qa-theme/SnowFlat/qa-theme.php
@@ -218,9 +218,9 @@ public function nav_main_sub()
 		$this->output('<div class="sb-toggle-left qam-menu-toggle"><i class="icon-th-list"></i></div>');
 		$this->nav_user_search();
 		$this->logo();
-		$this->nav('main');
+		$this->nav('main', null, "main navigation");
 		$this->output('</div> <!-- END qam-main-nav-wrapper -->');
-		$this->nav('sub');
+		$this->nav('sub', null, "sub navigation");
 	}
 
 	/**
@@ -320,7 +320,7 @@ public function sidepanel()
 			return;
 
 		$this->output('<div id="qam-sidepanel-toggle"><i class="icon-left-open-big"></i></div>');
-		$this->output('<div class="qa-sidepanel" id="qam-sidepanel-mobile">');
+		$this->output('<aside class="qa-sidepanel" id="qam-sidepanel-mobile">');
 		$this->qam_search();
 		$this->widgets('side', 'top');
 		$this->sidebar();
@@ -330,7 +330,7 @@ public function sidepanel()
 			$this->output_raw($this->content['sidepanel']);
 		$this->feed();
 		$this->widgets('side', 'bottom');
-		$this->output('</div> <!-- qa-sidepanel -->', '');
+		$this->output('</aside> <!-- qa-sidepanel -->', '');
 	}
 
 	/**
@@ -638,11 +638,12 @@ public function attribution()
 	 */
 	private function qam_user_account()
 	{
-		if (qa_is_logged_in()) {
+		$loginLinkLabel = 'Log in';
+	    if (qa_is_logged_in()) {
 			// get logged-in user avatar
 			$handle = qa_get_logged_in_user_field('handle');
 			$toggleClass = 'qam-logged-in';
-
+            $loginLinkLabel = "Open dropdown for logged in user {$handle}";
 			if (QA_FINAL_EXTERNAL_USERS)
 				$tobar_avatar = qa_get_external_avatar_html(qa_get_logged_in_user_field('userid'), $this->nav_bar_avatar_size, true);
 			else {
@@ -672,10 +673,10 @@ private function qam_user_account()
 		// finally output avatar with div tag
 		$handleBlock = empty($handle) ? '' : '<div class="qam-account-handle">' . qa_html($handle) . '</div>';
 		$this->output(
-			'<div id="qam-account-toggle" class="' . $toggleClass . '">',
+			'<a href="javascript:;" id="qam-account-toggle" class="' . $toggleClass . '" aria-label="' . $loginLinkLabel . '">',
 			$avatar,
 			$handleBlock,
-			'</div>'
+			'</a>'
 		);
 	}
 

From 6f3e3652a7f252fda64b0ca589b4ccc329dad8f2 Mon Sep 17 00:00:00 2001
From: Benjamin Klaus <klaus@technikum-wien.at>
Date: Mon, 18 May 2020 15:41:25 +0200
Subject: [PATCH 11/12] added class "sr-only", only for screenreaders

---
 qa-theme/Classic/qa-styles.css  | 11 +++++++++++
 qa-theme/SnowFlat/qa-styles.css | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/qa-theme/Classic/qa-styles.css b/qa-theme/Classic/qa-styles.css
index 4d71f43a5..3f3e72be2 100644
--- a/qa-theme/Classic/qa-styles.css
+++ b/qa-theme/Classic/qa-styles.css
@@ -474,3 +474,14 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
 	0% { background-color: #ffffaa; }
 	100% { background-color: #fff; }
 }
+
+.sr-only {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	margin: -1px;
+	padding: 0;
+	overflow: hidden;
+	clip: rect(0,0,0,0);
+	border: 0;
+}
diff --git a/qa-theme/SnowFlat/qa-styles.css b/qa-theme/SnowFlat/qa-styles.css
index 95ab65490..c58330cdb 100644
--- a/qa-theme/SnowFlat/qa-styles.css
+++ b/qa-theme/SnowFlat/qa-styles.css
@@ -3547,6 +3547,17 @@ input[type="submit"], button {
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.sr-only {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	margin: -1px;
+	padding: 0;
+	overflow: hidden;
+	clip: rect(0,0,0,0);
+	border: 0;
+}
+
 .icon-chat:before { content: '\e800'; }
 .icon-help:before { content: '\e801'; }
 .icon-comment:before { content: '\e802'; }

From 0603a45ab20e3f8bcd840b694d8050c7ab3a2f88 Mon Sep 17 00:00:00 2001
From: Benjamin Klaus <klaus@technikum-wien.at>
Date: Mon, 18 May 2020 15:41:35 +0200
Subject: [PATCH 12/12] added new translations

---
 qa-include/lang/qa-lang-main.php | 431 ++++++++++++++++---------------
 1 file changed, 222 insertions(+), 209 deletions(-)

diff --git a/qa-include/lang/qa-lang-main.php b/qa-include/lang/qa-lang-main.php
index 94679b9b4..330b576de 100644
--- a/qa-include/lang/qa-lang-main.php
+++ b/qa-include/lang/qa-lang-main.php
@@ -20,213 +20,226 @@
 */
 
 return array(
-	'_decimal_point' => '.',
-	'_thousands_separator' => ',',
-	'_thousands_suffix' => 'k',
-	'_millions_suffix' => 'm',
-	'1_answer' => '1 answer',
-	'1_comment' => '1 comment',
-	'1_day' => '1 day',
-	'1_disliked' => '1 dislike',
-	'1_flag' => '1 flag',
-	'1_hour' => '1 hour',
-	'1_liked' => '1 like',
-	'1_minute' => '1 minute',
-	'1_month' => '1 month',
-	'1_point' => '1 point',
-	'1_question' => '1 question',
-	'1_second' => '1 second',
-	'1_tag' => '1 tag',
-	'1_user' => '1 user',
-	'1_view' => '1 view',
-	'1_vote' => '1 vote',
-	'1_week' => '1 week',
-	'1_year' => '1 year',
-	'add_category_x_favorites' => 'Add category ^ to my favorites',
-	'add_favorites' => 'Add to my favorites',
-	'add_tag_x_favorites' => 'Add tag ^ to my favorites',
-	'all_categories' => 'All categories',
-	'anonymous' => 'anonymous',
-	'answer_edited' => 'answer edited',
-	'answer_reshown' => 'answer reshown',
-	'answer_selected' => 'answer selected',
-	'answered' => 'answered',
-	'answered_qs_in_x' => 'Most answered questions in ^',
-	'answered_qs_title' => 'Most answered questions',
-	'asked' => 'asked',
-	'asked_related_q' => 'asked related question',
-	'by_x' => 'by ^',
-	'cancel_button' => 'Cancel',
-	'closed' => 'closed',
-	'comment_edited' => 'comment edited',
-	'comment_moved' => 'comment moved',
-	'comment_reshown' => 'comment reshown',
-	'commented' => 'commented',
-	'date_day_min_digits' => 1, // 1 or 2
-	'date_format_other_years' => '^month ^day, ^year',
-	'date_format_this_year' => '^month ^day',
-	'date_month_1' => 'Jan',
-	'date_month_2' => 'Feb',
-	'date_month_3' => 'Mar',
-	'date_month_4' => 'Apr',
-	'date_month_5' => 'May',
-	'date_month_6' => 'Jun',
-	'date_month_7' => 'Jul',
-	'date_month_8' => 'Aug',
-	'date_month_9' => 'Sep',
-	'date_month_10' => 'Oct',
-	'date_month_11' => 'Nov',
-	'date_month_12' => 'Dec',
-	'date_year_digits' => 4, // 2 or 4
-	'edited' => 'edited',
-	'email_error' => 'An error occurred trying to send the email.',
-	'field_required' => 'Please enter something in this field',
-	'file_upload_limit_exceeded' => 'The size of the file exceeds the server\'s limits',
-	'general_error' => 'A server error occurred - please try again.',
-	'hidden' => 'hidden',
-	'highest_users' => 'Top scoring users',
-	'hot_qs_in_x' => 'Hot questions in ^',
-	'hot_qs_title' => 'Hot questions',
-	'image_not_read' => 'The image could not be read. Please upload one of: ^',
-	'image_too_big_x_pc' => 'This image is too big. Please scale to ^% then try again.',
-	'in_category_x' => 'in ^',
-	'ip_address_x' => 'IP address ^',
-	'logged_in_x' => 'Hello ^',
-	'max_length_x' => 'Maximum length is ^ characters',
-	'max_upload_size_x' => 'Maximum upload size is ^',
-	'me' => 'me',
-	'meta_order' => '^what^when^where^who', // you can reorder but DO NOT translate! e.g. <answered> <15 hours ago> <in Problems> <by me (500 points)>
-	'min_length_x' => 'Please provide more information - at least ^ characters',
-	'moved' => 'moved',
-	'nav_activity' => 'All Activity',
-	'nav_admin' => 'Admin',
-	'nav_ask' => 'Ask a Question',
-	'nav_categories' => 'Categories',
-	'nav_feedback' => 'Send feedback',
-	'nav_home' => 'Home',
-	'nav_hot' => 'Hot!',
-	'nav_login' => 'Login',
-	'nav_logout' => 'Logout',
-	'nav_most_answers' => 'Most answers',
-	'nav_most_recent' => 'Recent',
-	'nav_most_views' => 'Most views',
-	'nav_most_votes' => 'Most votes',
-	'nav_no_answer' => 'No answer',
-	'nav_no_selected_answer' => 'No selected answer',
-	'nav_no_upvoted_answer' => 'No upvoted answer',
-	'nav_qa' => 'Q&A',
-	'nav_qs' => 'Questions',
-	'nav_register' => 'Register',
-	'nav_tags' => 'Tags',
-	'nav_unanswered' => 'Unanswered',
-	'nav_updates' => 'My Updates',
-	'nav_users' => 'Users',
-	'newest_users' => 'Newest users',
-	'no_active_users' => 'No active users found',
-	'no_answers_found' => 'No answers found',
-	'no_answers_in_x' => 'No answers in ^',
-	'no_categories_found' => 'No categories found',
-	'no_category' => 'No category',
-	'no_comments_found' => 'No comments found',
-	'no_comments_in_x' => 'No comments in ^',
-	'no_questions_found' => 'No questions found',
-	'no_questions_in_x' => 'No questions in ^',
-	'no_related_qs_title' => 'No related questions found',
-	'no_results_for_x' => 'No results found for ^',
-	'no_tags_found' => 'No tags found',
-	'no_una_questions_found' => 'No unanswered questions found',
-	'no_una_questions_in_x' => 'No unanswered questions in ^',
-	'no_unselected_qs_found' => 'No questions found without a selected answer',
-	'no_unupvoteda_qs_found' => 'No questions found without an upvoted answer',
-	'page_label' => 'Page:',
-	'page_next' => 'next',
-	'page_not_found' => 'Page not found',
-	'page_prev' => 'prev',
-	'popular_tags' => 'Most popular tags',
-	'questions_tagged_x' => 'Recent questions tagged ^',
-	'recategorized' => 'recategorized',
-	'recent_activity_in_x' => 'Recent activity in ^',
-	'recent_activity_title' => 'Recent activity',
-	'recent_as_in_x' => 'Recently answered questions in ^',
-	'recent_as_title' => 'Recently answered questions',
-	'recent_cs_in_x' => 'Recently commented questions in ^',
-	'recent_cs_title' => 'Recently commented questions',
-	'recent_qs_as_in_x' => 'Recent questions and answers in ^',
-	'recent_qs_as_title' => 'Recent questions and answers',
-	'recent_qs_in_x' => 'Recent questions in ^',
-	'recent_qs_title' => 'Recent questions',
-	'related_qs_title' => 'Related questions',
-	'remove_favorites' => 'Remove from my favorites',
-	'remove_x_favorites' => 'Remove ^ from my favorites',
-	'reopened' => 'reopened',
-	'reshown' => 'reshown',
-	'results_for_x' => 'Search results for ^',
-	'retagged' => 'retagged',
-	'save_button' => 'Save Changes',
-	'search_button' => 'Search',
-	'search_explanation' => 'Please enter some text into the search box and try again.',
-	'search_title' => 'Search results',
-	'selected' => 'selected',
-	'send_button' => 'Send',
-	'since_x' => 'since ^',
-	'suggest_ask' => 'Help get things started by ^1asking a question^2.',
-	'suggest_category_qs' => 'To see more, click for all the ^1questions in this category^2.',
-	'suggest_qs' => 'To see more, click for the ^1full list of questions^2.',
-	'suggest_qs_tags' => 'To see more, click for the ^1full list of questions^2 or ^3popular tags^4.',
-	'to_x' => 'to ^',
-	'unanswered_qs_in_x' => 'Questions without answers in ^',
-	'unanswered_qs_title' => 'Recent questions without answers',
-	'unselected_qs_in_x' => 'Questions without a selected answer in ^',
-	'unselected_qs_title' => 'Recent questions without a selected answer',
-	'unupvoteda_qs_in_x' => 'Questions without an upvoted answer in ^',
-	'unupvoteda_qs_title' => 'Recent questions without an upvoted answer',
-	'upload_limit' => 'Too many uploads - please try again in an hour',
-	'view_q_must_be_approved' => 'Your account must be approved to view question pages. Please wait or ^1add more information^2.',
-	'view_q_must_confirm' => 'Please ^5confirm your email address^6 to view question pages.',
-	'view_q_must_login' => 'Please ^1log in^2 or ^3register^4 to view question pages.',
-	'viewed_qs_in_x' => 'Most viewed questions in ^',
-	'viewed_qs_title' => 'Most viewed questions',
-	'vote_disabled_approve' => 'Your account must be approved before you can vote',
-	'vote_disabled_down' => 'Voting down is only available to some users',
-	'vote_disabled_down_approve' => 'Your account must be approved before you can vote down',
-	'vote_disabled_hidden_post' => 'You cannot vote on hidden posts',
-	'vote_disabled_hidden_a' => 'You cannot vote on hidden answers',  // @deprecated
-	'vote_disabled_hidden_q' => 'You cannot vote on hidden questions',  // @deprecated
-	'vote_disabled_level' => 'Voting is only available to some users',
-	'vote_disabled_my_post' => 'You cannot vote on your own posts',
-	'vote_disabled_my_a' => 'You cannot vote on your own answers',  // @deprecated
-	'vote_disabled_my_q' => 'You cannot vote on your own questions',  // @deprecated
-	'vote_disabled_q_page_only' => 'Please view this question to vote',
-	'vote_disabled_queued' => 'You can only vote on approved posts',
-	'vote_down_must_confirm' => 'Please ^5confirm your email address^6 to vote down.',
-	'vote_down_popup' => 'Click to vote down',
-	'vote_limit' => 'Too many votes received - please try again in an hour',
-	'vote_must_confirm' => 'Please ^5confirm your email address^6 to vote.',
-	'vote_must_login' => 'Please ^1log in^2 or ^3register^4 to vote.',
-	'vote_not_allowed' => 'Voting on this is not allowed',
-	'vote_up_popup' => 'Click to vote up',
-	'voted_down_popup' => 'You have voted this down - click to remove vote',
-	'voted_qs_in_x' => 'Highest voted questions in ^',
-	'voted_qs_title' => 'Highest voted questions',
-	'voted_up_popup' => 'You have voted this up - click to remove vote',
-	'written' => '', // blank in English - placeholder for other languages
-	'x_ago' => '^ ago',
-	'x_answers' => '^ answers',
-	'x_comments' => '^ comments',
-	'x_days' => '^ days',
-	'x_disliked' => '^ dislike',
-	'x_flags' => '^ flags',
-	'x_hours' => '^ hours',
-	'x_liked' => '^ like',
-	'x_minutes' => '^ minutes',
-	'x_months' => '^ months',
-	'x_points' => '^ points',
-	'x_questions' => '^ questions',
-	'x_seconds' => '^ seconds',
-	'x_tags' => '^ tags',
-	'x_users' => '^ users',
-	'x_views' => '^ views',
-	'x_votes' => '^ votes',
-	'x_weeks' => '^ weeks',
-	'x_years' => '^ years',
+    '_decimal_point' => '.',
+    '_thousands_separator' => ',',
+    '_thousands_suffix' => 'k',
+    '_millions_suffix' => 'm',
+    '1_answer' => '1 answer',
+    '1_comment' => '1 comment',
+    '1_day' => '1 day',
+    '1_disliked' => '1 dislike',
+    '1_flag' => '1 flag',
+    '1_hour' => '1 hour',
+    '1_liked' => '1 like',
+    '1_minute' => '1 minute',
+    '1_month' => '1 month',
+    '1_point' => '1 point',
+    '1_question' => '1 question',
+    '1_second' => '1 second',
+    '1_tag' => '1 tag',
+    '1_user' => '1 user',
+    '1_view' => '1 view',
+    '1_vote' => '1 vote',
+    '1_week' => '1 week',
+    '1_year' => '1 year',
+    'add_category_x_favorites' => 'Add category ^ to my favorites',
+    'add_favorites' => 'Add to my favorites',
+    'add_tag_x_favorites' => 'Add tag ^ to my favorites',
+    'all_categories' => 'All categories',
+    'anonymous' => 'anonymous',
+    'answer_edited' => 'answer edited',
+    'answer_reshown' => 'answer reshown',
+    'answer_selected' => 'answer selected',
+    'answered' => 'answered',
+    'answered_qs_in_x' => 'Most answered questions in ^',
+    'answered_qs_title' => 'Most answered questions',
+    'asked' => 'asked',
+    'asked_related_q' => 'asked related question',
+    'by_x' => 'by ^',
+    'cancel_button' => 'Cancel',
+    'closed' => 'closed',
+    'close_msg' => 'close message',
+    'comment_edited' => 'comment edited',
+    'comment_moved' => 'comment moved',
+    'comment_reshown' => 'comment reshown',
+    'commented' => 'commented',
+    'date_day_min_digits' => 1, // 1 or 2
+    'date_format_other_years' => '^month ^day, ^year',
+    'date_format_this_year' => '^month ^day',
+    'date_month_1' => 'Jan',
+    'date_month_2' => 'Feb',
+    'date_month_3' => 'Mar',
+    'date_month_4' => 'Apr',
+    'date_month_5' => 'May',
+    'date_month_6' => 'Jun',
+    'date_month_7' => 'Jul',
+    'date_month_8' => 'Aug',
+    'date_month_9' => 'Sep',
+    'date_month_10' => 'Oct',
+    'date_month_11' => 'Nov',
+    'date_month_12' => 'Dec',
+    'date_year_digits' => 4, // 2 or 4
+    'edited' => 'edited',
+    'email_error' => 'An error occurred trying to send the email.',
+    'email_optional' => 'Email address (optional)',
+    'field_required' => 'Please enter something in this field',
+    'file_upload_limit_exceeded' => 'The size of the file exceeds the server\'s limits',
+    'general_error' => 'A server error occurred - please try again.',
+    'hidden' => 'hidden',
+    'highest_users' => 'Top scoring users',
+    'hot_qs_in_x' => 'Hot questions in ^',
+    'hot_qs_title' => 'Hot questions',
+    'image_not_read' => 'The image could not be read. Please upload one of: ^',
+    'image_too_big_x_pc' => 'This image is too big. Please scale to ^% then try again.',
+    'in_category_x' => 'in ^',
+    'ip_address_x' => 'IP address ^',
+    'logged_in_x' => 'Hello ^',
+    'max_length_x' => 'Maximum length is ^ characters',
+    'max_upload_size_x' => 'Maximum upload size is ^',
+    'me' => 'me',
+    'meta_order' => '^what^when^where^who', // you can reorder but DO NOT translate! e.g. <answered> <15 hours ago> <in Problems> <by me (500 points)>
+    'min_length_x' => 'Please provide more information - at least ^ characters',
+    'moved' => 'moved',
+    'nav_activity' => 'All Activity',
+    'nav_admin' => 'Admin',
+    'nav_ask' => 'Ask a Question',
+    'nav_categories' => 'Categories',
+    'nav_feedback' => 'Send feedback',
+    'nav_home' => 'Home',
+    'nav_hot' => 'Hot!',
+    'nav_login' => 'Login',
+    'nav_login_link_title' => "Show menu for logged in user &quot;^&quot;",
+    'signed_in_as' => "Signed in as &quot;^&quot;",
+    'admin_section' => "Admin section",
+    'profile_section' => "Profile section",
+    'nav_logout' => 'Logout',
+    'nav_most_answers' => 'Most answers',
+    'nav_most_recent' => 'Recent',
+    'nav_most_views' => 'Most views',
+    'nav_most_votes' => 'Most votes',
+    'nav_no_answer' => 'No answer',
+    'nav_no_selected_answer' => 'No selected answer',
+    'nav_no_upvoted_answer' => 'No upvoted answer',
+    'nav_qa' => 'Q&A',
+    'nav_qs' => 'Questions',
+    'nav_register' => 'Register',
+    'nav_tags' => 'Tags',
+    'nav_unanswered' => 'Unanswered',
+    'nav_updates' => 'My Updates',
+    'nav_users' => 'Users',
+    'newest_users' => 'Newest users',
+    'no_active_users' => 'No active users found',
+    'no_answers_found' => 'No answers found',
+    'no_answers_in_x' => 'No answers in ^',
+    'no_categories_found' => 'No categories found',
+    'no_category' => 'No category',
+    'no_comments_found' => 'No comments found',
+    'no_comments_in_x' => 'No comments in ^',
+    'no_questions_found' => 'No questions found',
+    'no_questions_in_x' => 'No questions in ^',
+    'no_related_qs_title' => 'No related questions found',
+    'no_results_for_x' => 'No results found for ^',
+    'no_tags_found' => 'No tags found',
+    'no_una_questions_found' => 'No unanswered questions found',
+    'no_una_questions_in_x' => 'No unanswered questions in ^',
+    'no_unselected_qs_found' => 'No questions found without a selected answer',
+    'no_unupvoteda_qs_found' => 'No questions found without an upvoted answer',
+    'page_label' => 'Page:',
+    'page_next' => 'next',
+    'page_not_found' => 'Page not found',
+    'page_prev' => 'prev',
+    'popular_tags' => 'Most popular tags',
+    'questions_tagged_x' => 'Recent questions tagged ^',
+    'list_of' => 'list of',
+    'user_account' => 'Account',
+    'recategorized' => 'recategorized',
+    'recent_activity_in_x' => 'Recent activity in ^',
+    'recent_activity_title' => 'Recent activity',
+    'recent_as_in_x' => 'Recently answered questions in ^',
+    'recent_as_title' => 'Recently answered questions',
+    'recent_cs_in_x' => 'Recently commented questions in ^',
+    'recent_cs_title' => 'Recently commented questions',
+    'recent_qs_as_in_x' => 'Recent questions and answers in ^',
+    'recent_qs_as_title' => 'Recent questions and answers',
+    'recent_qs_in_x' => 'Recent questions in ^',
+    'recent_qs_title' => 'Recent questions',
+    'related_qs_title' => 'Related questions',
+    'remove_favorites' => 'Remove from my favorites',
+    'remove_x_favorites' => 'Remove ^ from my favorites',
+    'reopened' => 'reopened',
+    'reshown' => 'reshown',
+    'results_for_x' => 'Search results for ^',
+    'retagged' => 'retagged',
+    'save_button' => 'Save Changes',
+    'search_button' => 'Search',
+    'search_explanation' => 'Please enter some text into the search box and try again.',
+    'search_title' => 'Search results',
+    'selected' => 'selected',
+    'send_button' => 'Send',
+    'since_x' => 'since ^',
+    'suggest_ask' => 'Help get things started by ^1asking a question^2.',
+    'suggest_category_qs' => 'To see more, click for all the ^1questions in this category^2.',
+    'suggest_qs' => 'To see more, click for the ^1full list of questions^2.',
+    'suggest_qs_tags' => 'To see more, click for the ^1full list of questions^2 or ^3popular tags^4.',
+    'to_x' => 'to ^',
+    'unanswered_qs_in_x' => 'Questions without answers in ^',
+    'unanswered_qs_title' => 'Recent questions without answers',
+    'unselected_qs_in_x' => 'Questions without a selected answer in ^',
+    'unselected_qs_title' => 'Recent questions without a selected answer',
+    'unupvoteda_qs_in_x' => 'Questions without an upvoted answer in ^',
+    'unupvoteda_qs_title' => 'Recent questions without an upvoted answer',
+    'upload_limit' => 'Too many uploads - please try again in an hour',
+    'view_q_must_be_approved' => 'Your account must be approved to view question pages. Please wait or ^1add more information^2.',
+    'view_q_must_confirm' => 'Please ^5confirm your email address^6 to view question pages.',
+    'view_q_must_login' => 'Please ^1log in^2 or ^3register^4 to view question pages.',
+    'viewed_qs_in_x' => 'Most viewed questions in ^',
+    'viewed_qs_title' => 'Most viewed questions',
+    'vote_disabled_approve' => 'Your account must be approved before you can vote',
+    'vote_disabled_down' => 'Voting down is only available to some users',
+    'vote_disabled_down_approve' => 'Your account must be approved before you can vote down',
+    'vote_disabled_hidden_post' => 'You cannot vote on hidden posts',
+    'vote_disabled_hidden_a' => 'You cannot vote on hidden answers',  // @deprecated
+    'vote_disabled_hidden_q' => 'You cannot vote on hidden questions',  // @deprecated
+    'vote_disabled_level' => 'Voting is only available to some users',
+    'vote_disabled_my_post' => 'You cannot vote on your own posts',
+    'vote_disabled_my_a' => 'You cannot vote on your own answers',  // @deprecated
+    'vote_disabled_my_q' => 'You cannot vote on your own questions',  // @deprecated
+    'vote_disabled_q_page_only' => 'Please view this question to vote',
+    'vote_disabled_queued' => 'You can only vote on approved posts',
+    'vote_down_must_confirm' => 'Please ^5confirm your email address^6 to vote down.',
+    'vote_down_popup' => 'Click to vote down',
+    'vote_down_popup_answer' => 'Vote down answer',
+    'vote_down_popup_question' => 'Vote down question',
+    'vote_limit' => 'Too many votes received - please try again in an hour',
+    'vote_must_confirm' => 'Please ^5confirm your email address^6 to vote.',
+    'vote_must_login' => 'Please ^1log in^2 or ^3register^4 to vote.',
+    'vote_not_allowed' => 'Voting on this is not allowed',
+    'vote_up_popup_answer' => 'Vote up answer',
+    'vote_up_popup_question' => 'Vote up question',
+    'vote_up_popup' => 'Click to vote up',
+    'voted_down_popup' => 'You have voted this down - click to remove vote',
+    'voted_qs_in_x' => 'Highest voted questions in ^',
+    'voted_qs_title' => 'Highest voted questions',
+    'voted_up_popup' => 'You have voted this up - click to remove vote',
+    'netvote_of_question' => 'Votes for this question:',
+    'written' => '', // blank in English - placeholder for other languages
+    'x_ago' => '^ ago',
+    'x_answers' => '^ answers',
+    'x_comments' => '^ comments',
+    'x_days' => '^ days',
+    'x_disliked' => '^ dislike',
+    'x_flags' => '^ flags',
+    'x_hours' => '^ hours',
+    'x_liked' => '^ like',
+    'x_minutes' => '^ minutes',
+    'x_months' => '^ months',
+    'x_points' => '^ points',
+    'x_questions' => '^ questions',
+    'x_seconds' => '^ seconds',
+    'x_tags' => '^ tags',
+    'x_users' => '^ users',
+    'x_views' => '^ views',
+    'x_votes' => '^ votes',
+    'x_weeks' => '^ weeks',
+    'x_years' => '^ years',
 );