diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties
index 99e7b237..6b82d5a1 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties
@@ -279,7 +279,7 @@ help.homepage.title=\u041E\u0444\u0438\u0446\u0438\u0430\u043B\u0435\u043D \u044
 help.forum.title=\u0424\u043E\u0440\u0443\u043C
 help.shop.title=\u041C\u0430\u0433\u0430\u0437\u0438\u043D
 help.contact.title=\u041A\u043E\u043D\u0442\u0430\u043A\u0442
-help.contact.text={0} \u0435 \u0441\u044A\u0437\u0434\u0430\u0434\u0435\u043D \u0438 \u0441\u0435 \u043F\u043E\u0434\u0434\u044A\u0440\u0436\u0430 \u043E\u0442 Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). \u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0432\u044A\u043F\u0440\u043E\u0441\u0438, \u043A\u043E\u043C\u0435\u043D\u0442\u0430\u0440\u0438 \u0438\u043B\u0438 \u043F\u0440\u0435\u0434\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u0437\u0430 \u043F\u043E\u0434\u043E\u0431\u0440\u0435\u043D\u0438\u044F, \u043C\u043E\u043B\u044F \u043F\u043E\u0441\u0435\u0442\u0435\u0442\u0435 <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic \u0424\u043E\u0440\u0443\u043C</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=\u041B\u043E\u0433 \u0444\u0430\u0439\u043B\u043E\u0432\u0435
 help.logfile=\u0426\u0435\u043B\u0438\u044F\u0442 \u043B\u043E\u0433 \u0435 \u0437\u0430\u043F\u0430\u0437\u0435\u043D \u0432 {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=\u0412\u044A\u043D\u0448\u0435\u043D \u0432\u0438\u0434 \u0437\u0430 {0}
 personalsettings.language=\u0415\u0437\u0438\u043A
@@ -415,6 +418,7 @@ transcodingsettings.step2=\u0421\u0442\u044A\u043F\u043A\u0430 2
 transcodingsettings.step3=\u0421\u0442\u044A\u043F\u043A\u0430 3
 transcodingsettings.add=\u0414\u043E\u0431\u0430\u0432\u0438 \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u0430\u043D\u0435
 transcodingsettings.defaultactive=\u041F\u043E \u043F\u043E\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043D\u0435
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=\u041F\u0440\u0435\u043F\u043E\u0440\u044A\u0447\u0438\u0442\u0435\u043B\u043D\u0430 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F
 transcodingsettings.noname=\u041C\u043E\u043B\u044F \u043F\u043E\u0441\u043E\u0447\u0435\u0442\u0435 \u0438\u043C\u0435.
 transcodingsettings.nosourceformat=\u041C\u043E\u043B\u044F \u043F\u043E\u0441\u043E\u0447\u0435\u0442\u0435 \u0444\u043E\u0440\u043C\u0430\u0442\u0430 \u043E\u0442 \u043A\u043E\u0439\u0442\u043E \u0449\u0435 \u0441\u0435 \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u0430.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties
index c917fc08..704ab5e6 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties
@@ -279,7 +279,7 @@ help.homepage.title=P\u00E0gina web del projecte
 help.forum.title=F\u00F2rum
 help.shop.title=Merchandise
 help.contact.title=Contacte
-help.contact.text={0} est\u00E0 desenvolupat i mantingut per Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). Si vost\u00E8 t\u00E9 alguna pregunta, comentari o suggeriment, si us plau visiti <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic Forum</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=El log complet esta guardat a {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Configuraci\u00F3 d'aparen\u00E7a per a {0}
 personalsettings.language=Idioma
@@ -415,6 +418,7 @@ transcodingsettings.step2=Pas 2
 transcodingsettings.step3=Pas 3
 transcodingsettings.add=Add transcoding
 transcodingsettings.defaultactive=Enable transcoding settings for all existing and new players.
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Recommended configuration
 transcodingsettings.noname=Si us plau, especifiqui un nom.
 transcodingsettings.nosourceformat=Si us plau, especifiqui un format des d'on convertir.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties
index ea7c768f..a67b6289 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties
@@ -279,7 +279,7 @@ help.homepage.title=Domovsk\u00E1 str\u00E1nka
 help.forum.title=F\u00F3rum
 help.shop.title=Obchod
 help.contact.title=Kontakt
-help.contact.text={0} je vyv\u00EDjen a udr\u017Eov\u00E1n Sindrem Mehusem (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). Jestli\u017Ee m\u00E1te jak\u00FDkoliv dotaz, p\u0159ipom\u00EDnku nebo n\u00E1m\u011Bt na zlep\u0161en\u00ED, nav\u0161tivte <a href="https://www.reddit.com/r/airsonic" target="_blank">f\u00F3rum Airsonicu</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Protokol
 help.logfile=Kompletn\u00ED protokol je ulo\u017Een v {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Osobn\u00ED nastaven\u00ED u\u017Eivatele {0}
 personalsettings.language=Jazyk
@@ -415,6 +418,7 @@ transcodingsettings.step2=Krok 2
 transcodingsettings.step3=Krok 3
 transcodingsettings.add=P\u0159idat p\u0159ek\u00F3dov\u00E1n\u00ED
 transcodingsettings.defaultactive=Povolit toto p\u0159ek\u00F3dov\u00E1n\u00ED pro v\u0161echny existuj\u00EDc\u00ED a nov\u00E9 p\u0159ehr\u00E1va\u010De.
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Doporu\u010Den\u00E1 konfigurace
 transcodingsettings.noname=Zadejte n\u00E1zev.
 transcodingsettings.nosourceformat=Zadejte form\u00E1t, ze kter\u00E9ho p\u0159ev\u00E1d\u011Bt
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties
index d4de1fde..6aacc7b5 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties
@@ -279,7 +279,7 @@ help.homepage.title=Hjemmeside
 help.forum.title=Forum
 help.shop.title=Merchandise
 help.contact.title=Kontakt
-help.contact.text={0} er udviklet og vedligeholdes af Sindre Mehus (<a href="mailto:sindre@activeobjects.no"> sindre@activeobjects.no </a>). Hvis du har sp\u00F8rgsm\u00E5l, kommentarer eller forslag til forbedringer, kan du bes\u00F8ge <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic Forum</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=Den komplette log er gemt i {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Personlige indstillinger for {0}
 personalsettings.language=Sprog
@@ -415,6 +418,7 @@ transcodingsettings.step2=Trin 2
 transcodingsettings.step3=Trin 3
 transcodingsettings.add=Tilf\u00F8j kodning
 transcodingsettings.defaultactive=Standard
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Recommended configuration
 transcodingsettings.noname=Angiv et navn.
 transcodingsettings.nosourceformat=Angiv formatet til at konvertere fra.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties
index 0c101c2c..afe84a82 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties
@@ -65,7 +65,7 @@ top.upgrade=Eine neue Version ist erh\u00E4ltlich. Download {0} {1} <a href="#"
 top.missing=Keine Musikordner gefunden. Bitte die Einstellungen \u00FCberpr\u00FCfen.
 top.logout=Ausloggen {0}
 # left.jsp
-left.scanning=Scanning media folders\u2026
+left.scanning=Durchsuche Medien Ordner
 left.statistics={0}&nbsp;K\u00FCnstler<br>{1}&nbsp;Alben<br>{2}&nbsp;Songs<br>{3} (&#126; {4} Stunden)
 left.shortcut=Spezialordner
 left.playlists=Wiedergabelisten
@@ -279,7 +279,7 @@ help.homepage.title=Homepage
 help.forum.title=Forum
 help.shop.title=Fan-Artikel Shop
 help.contact.title=Kontakt
-help.contact.text={0} ist von Sindre Mehus entwickelt worden (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). Wenn du Fragen, Kommentare oder Vorschl\u00E4ge f\u00FCr Verbesserungen hast, dann besuche bitte das <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic Forum</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=Der komplette Log ist gespeichert in {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=Keine
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=Absender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Layout Einstellungen f\u00FCr {0}
 personalsettings.language=Sprache
@@ -415,6 +418,7 @@ transcodingsettings.step2=Schritt 2
 transcodingsettings.step3=Schritt 3
 transcodingsettings.add=Transcoding hinzuf\u00FCgen
 transcodingsettings.defaultactive=Standard
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Empfohlene Konfiguratiom
 transcodingsettings.noname=Bitte einen Namen eingeben.
 transcodingsettings.nosourceformat=Bitte das Format angeben von dem konvertiert wird.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Verschl\u00FCsselung
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties
index cf64f95b..920be879 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties
@@ -279,7 +279,7 @@ help.homepage.title=\u0391\u03C1\u03C7\u03B9\u03BA\u03AE
 help.forum.title=\u03A6\u03CC\u03C1\u03BF\u03C5\u03BC
 help.shop.title=\u0395\u03BC\u03C0\u03CC\u03C1\u03B5\u03C5\u03BC\u03B1
 help.contact.title=\u0395\u03C0\u03B9\u03BA\u03BF\u03B9\u03BD\u03C9\u03BD\u03AF\u03B1
-help.contact.text={0} \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B1\u03BD\u03B5\u03C0\u03C4\u03C5\u03B3\u03BC\u03AD\u03BD\u03BF \u03BA\u03B1\u03B9 \u03C3\u03C5\u03BD\u03C4\u03B7\u03C1\u03AE\u03C4\u03B1\u03B9 \u03B1\u03C0\u03BF \u03C4\u03BF\u03BD Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). \u0391\u03BD \u03AD\u03C7\u03B5\u03C4\u03B5 \u03B5\u03C1\u03C9\u03C4\u03AE\u03C3\u03B5\u03B9\u03C2, \u03C3\u03C7\u03CC\u03BB\u03B9\u03B1, \u03AE \u03C0\u03C1\u03BF\u03C4\u03AC\u03C3\u03B5\u03B9\u03C2 \u03B3\u03B9\u03B1 \u03B2\u03B5\u03BB\u03C4\u03AF\u03C9\u03C3\u03B7 \u03C4\u03BF\u03C5 \u03BB\u03BF\u03B3\u03B9\u03C3\u03BC\u03B9\u03BA\u03BF\u03CD \u03C0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03B5\u03C0\u03B9\u03C3\u03BA\u03B5\u03C6\u03B8\u03B5\u03AF\u03C4\u03B5 \u03C4\u03BF <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic Forum</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=\u0391\u03C1\u03C7\u03B5\u03AF\u03BF \u03BA\u03B1\u03C4\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2
 help.logfile=\u038C\u03BB\u03BF \u03C4\u03BF \u03B1\u03C1\u03C7\u03B5\u03AF\u03BF \u03BA\u03B1\u03C4\u03B1\u03B3\u03C1\u03B1\u03C6\u03AE\u03C2 \u03B2\u03C1\u03AF\u03C3\u03BA\u03B5\u03C4\u03B1\u03B9 \u03C3\u03C4\u03BF {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=\u03A0\u03C1\u03BF\u03C3\u03C9\u03C0\u03B9\u03BA\u03AD\u03C2 \u03C1\u03C5\u03B8\u03BC\u03AF\u03C3\u03B5\u03B9\u03C2 \u03B3\u03B9\u03B1 {0}
 personalsettings.language=\u0393\u03BB\u03CE\u03C3\u03C3\u03B1
@@ -415,6 +418,7 @@ transcodingsettings.step2=\u0392\u03AE\u03BC\u03B1 2
 transcodingsettings.step3=\u0392\u03AE\u03BC\u03B1 3
 transcodingsettings.add=\u03A0\u03C1\u03CC\u03C3\u03B8\u03B5\u03C3\u03B7 \u03B5\u03C0\u03B1\u03BD\u03B1\u03BA\u03C9\u03B4\u03B9\u03BA\u03BF\u03C0\u03BF\u03AF\u03B7\u03C3\u03B7\u03C2
 transcodingsettings.defaultactive=\u03A0\u03C1\u03BF\u03B5\u03C0\u03B9\u03BB\u03BF\u03B3\u03AE
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=\u03A0\u03C1\u03BF\u03C4\u03B5\u03B9\u03BD\u03CC\u03BC\u03B5\u03BD\u03B7 \u03B4\u03B9\u03B1\u03BC\u03CC\u03C1\u03C6\u03C9\u03C3\u03B7
 transcodingsettings.noname=\u03A0\u03C1\u03BF\u03C3\u03B4\u03B9\u03BF\u03C1\u03AF\u03C3\u03C4\u03B5 \u03AD\u03BD\u03B1 \u03CC\u03BD\u03BF\u03BC\u03B1
 transcodingsettings.nosourceformat=\u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03C0\u03C1\u03BF\u03C3\u03B4\u03B9\u03BF\u03C1\u03AF\u03C3\u03C4\u03B5 \u03C4\u03BF\u03BD \u03C4\u03CD\u03C0\u03BF \u03BC\u03B5\u03C4\u03B1\u03C4\u03C1\u03BF\u03C0\u03AE\u03C2 \u03B1\u03C0\u03CC.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties
index d4c0296d..bad41277 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties
@@ -279,7 +279,7 @@ help.homepage.title=Homepage
 help.forum.title=Forum
 help.shop.title=Merchandise
 help.contact.title=Contact
-help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues">issue tracker on GitHub</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=The complete log is saved in {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Personal settings for {0}
 personalsettings.language=Language
@@ -415,6 +418,7 @@ transcodingsettings.step2=Step 2
 transcodingsettings.step3=Step 3
 transcodingsettings.add=Add transcoding
 transcodingsettings.defaultactive=Enable transcoding settings for all existing and new players.
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Recommended configuration
 transcodingsettings.noname=Please specify a name.
 transcodingsettings.nosourceformat=Please specify the format to convert from.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties
index e3969bc4..34f16036 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties
@@ -279,7 +279,7 @@ help.homepage.title=Inicio
 help.forum.title=Foro
 help.shop.title=Merchandise
 help.contact.title=Contacto
-help.contact.text={0} est&aacute; desarrollado y mantenido por Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). Si usted tiene alguna pregunta, comentario o sugerencia de mejoras, por favor visite <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic Forum</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=El log completo est\u00E1 guardado en {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=Ninguna
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=Remitente
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Configuraci&oacute;n de apariencia para {0}
 personalsettings.language=Idioma
@@ -415,6 +418,7 @@ transcodingsettings.step2=Paso 2
 transcodingsettings.step3=Paso 3
 transcodingsettings.add=A\u00F1adir transcodificaci\u00F3n
 transcodingsettings.defaultactive=Habilitar esta transcodificaci\u00F3n para todos las reproducciones nuevas y existentes.
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Configuraci\u00F3n recomendada
 transcodingsettings.noname=Por favor especifique un nombre.
 transcodingsettings.nosourceformat=Por favor especifique un formato desde el que convertir.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=Cifrado SMTP
 helppopup.smtpEncryption.text=<p>El m\u00E9todo de cifrado para ser usado en la conexi\u00F3n con el servidor SMTP. Elije "ninguna" para seleccionar sin cifrado.</p>
 helppopup.smtpFrom.title=Direcci\u00F3n de origen
 helppopup.smtpFrom.text=<p>La direcci\u00F3n del remitente para los correos electr\u00F3nicos con origen en el servidor Airsonic. Debe de ser una direcci\u00F3n de correo electr\u00F3nico v\u00E1lida.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Reglas para el escaneo de las carpetas de medios
 helppopup.scanMediaFolders.text=<p>Nota que cualquier carpeta cuyo nombre comience con punto (.) o con @eaDir ser\u00E1 ignorada. Tambi\u00E9n todos los ficheros Thumbs.db.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties
index e985ad77..2968eaef 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties
@@ -279,7 +279,7 @@ help.homepage.title=Kodulehekülg
 help.forum.title=Foorum
 help.shop.title=Osta
 help.contact.title=Võta ühendust
-help.contact.text={0}u arendajaks ja ülalpidajaks on Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). Kui sul on küsimusi, kommentaare või soovitusi portaali täiustamiseks siis palun külasta <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonicu foorumit</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Logi
 help.logfile=Kokkuvõtlik logi on salvestatud asukohta {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Isiklikud seaded {0}u jaoks
 personalsettings.language=Keel
@@ -415,6 +418,7 @@ transcodingsettings.step2=2. samm
 transcodingsettings.step3=3. samm
 transcodingsettings.add=Lisa konverditav
 transcodingsettings.defaultactive=Luba see konvertimine kõikidel olemasolevatel ja uutele meediaesitajatel.
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Soovitatavad seadistused
 transcodingsettings.noname=Täpsusta nimi.
 transcodingsettings.nosourceformat=Täpsusta, mis formaadist konverditakse.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties
index a9e77cae..4db7a0da 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties
@@ -279,7 +279,7 @@ help.homepage.title=Kotisivu
 help.forum.title=Foorumi
 help.shop.title=Oheistuotteet
 help.contact.title=Yhteystiedot
-help.contact.text={0} ohjelman on kehitt\u00E4nyt ja yll\u00E4pit\u00E4\u00E4 Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). Jos sinulla on kysytt\u00E4v\u00E4\u00E4, kommentoitavaa tai parannusehdotuksia ohjelmaan, vieraile <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic Foorumissa</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Loki
 help.logfile=T\u00E4ydellinen loki on tallennettu {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Henkil\u00F6kohtaiset asetukset profiilille {0}
 personalsettings.language=Kieli
@@ -415,6 +418,7 @@ transcodingsettings.step2=Vaihe 2
 transcodingsettings.step3=Vaihe 3
 transcodingsettings.add=Lis\u00E4\u00E4 uusi s\u00E4\u00E4nt\u00F6
 transcodingsettings.defaultactive=Oletus
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Recommended configuration
 transcodingsettings.noname=Anna s\u00E4\u00E4nn\u00F6lle nimi.
 transcodingsettings.nosourceformat=M\u00E4\u00E4rit\u00E4 mist\u00E4 tiedostomuodosta muunnetaan.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties
index fe4c5d08..3840cfd7 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties
@@ -65,7 +65,7 @@ top.upgrade=Une nouvelle version est disponible. T\u00E9l\u00E9charger {0} {1} <
 top.missing=Aucun fichier trouv\u00E9. Veuillez modifier vos param\u00E8tres.
 top.logout=Se d\u00E9connecter
 # left.jsp
-left.scanning=Scanning media folders\u2026
+left.scanning=Analyse des dossiers en cours\u2026
 left.statistics={0}&nbsp;artistes<br>{1}&nbsp;albums<br>{2}&nbsp;chansons<br>{3} (&#126; {4} heures)
 left.shortcut=Raccourcis
 left.playlists=Playlists
@@ -85,7 +85,7 @@ playlist.repeat_off=R\u00E9p\u00E9ter non autoris\u00E9
 playlist.repeat_radio=Arr\u00EAter la lecture &quot;Radio&quot;
 playlist.undo=Annuler
 playlist.settings=Param\u00E8tres
-playlist.more=More actions\u2026
+playlist.more=Plus d'actions\u2026
 playlist.more.playlist=Liste de lecture
 playlist.more.sortbytrack=Trier par pistes
 playlist.more.sortbyartist=Trier par artistes
@@ -226,15 +226,15 @@ more.random.6months=il y a 6 mois
 more.random.1year=il y a un an
 more.apps.title=Applications
 more.apps.text=Des <a href="https://airsonic.github.io/docs/apps" target="_blank">applications Airsonic</a> sont disponibles pour <b>iPhone</b>, <b>Android</b> et <b>AIR</b>.
-more.status.title=Network Status
+more.status.title=\u00C9tat R\u00E9seau
 more.status.text=<a href="status.view">Monitor</a> the real-time status of all network media streams.
-more.keyboard.title=Keyboard Shortcuts
-more.keyboard.text=Keyboard shortcuts can be enabled in the <a href="personalSettings.view">user preferences</a>. Supported shortcuts are listed below.
-more.keyboard.playback=Playback
+more.keyboard.title=Raccourcis Clavier
+more.keyboard.text=Les raccourcis clavier peuvent \u00EAtre activ\u00E9s dans les <a href="personalSettings.view">pr\u00E9f\u00E9rences de l'utilisateur</a>. Les raccourcis support\u00E9s sont list\u00E9s ci-dessous.
+more.keyboard.playback=Lecture
 more.keyboard.navigation=Navigation
-more.keyboard.general=General
+more.keyboard.general=G\u00E9n\u00E9ral
 more.keyboard.playpause=Jouer ou mettre en pause
-more.keyboard.previous=Go to previous song
+more.keyboard.previous=Aller au morceau pr\u00E9c\u00E9dent
 more.keyboard.next=Aller au morceau suivant
 more.keyboard.volumedown=Diminuer le volume du player
 more.keyboard.volumeup=Augmenter le volume du player
@@ -279,7 +279,7 @@ help.homepage.title=Page d''accueil
 help.forum.title=Forum
 help.shop.title=Marchandises
 help.contact.title=Contact
-help.contact.text={0} est developp\u00E9 et maintenu par Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). Si vous avez des questions, commentaires ou suggestions pour l''am\u00E9liorer, visitez le <a href="https://www.reddit.com/r/airsonic" target="_blank">Forum Airsonic</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=L''historique complet est sauvegard\u00E9e dans {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Param\u00E8tres personnels pour {0}
 personalsettings.language=Langue
@@ -415,6 +418,7 @@ transcodingsettings.step2=Etape 2
 transcodingsettings.step3=Etape 3
 transcodingsettings.add=Ajouter un transcodage
 transcodingsettings.defaultactive=Par d\u00E9faut
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Configuration recommand\u00E9e
 transcodingsettings.noname=Veuillez indiquer un nom.
 transcodingsettings.nosourceformat=Veuillez indiquer le format de la source.
@@ -499,15 +503,15 @@ sharesettings.deleteexpired=Delete all expired
 usersettings.title=S\u00E9lectionner un utilisateur
 usersettings.newuser=Nouvel utilisateur
 usersettings.admin=Nouvel administrateur
-usersettings.settings=Permettre \u00E0 l''utilisateur de changer ses options et son mot de passe
-usersettings.stream=Permettre \u00E0 l''utilisateur de jouer des fichiers
-usersettings.jukebox=Permettre \u00E0 l''utilisateur de jouer les fichiers en mode jukebox
-usersettings.download=Permettre \u00E0 l''utilisateur de t\u00E9l\u00E9charger des fichiers
-usersettings.upload=Permettre \u00E0 l''utilisateur d''envoyer des fichiers
+usersettings.settings=Permettre \u00E0 l'utilisateur de changer ses options et son mot de passe
+usersettings.stream=Permettre \u00E0 l'utilisateur de jouer des fichiers
+usersettings.jukebox=Permettre \u00E0 l'utilisateur de jouer les fichiers en mode jukebox
+usersettings.download=Permettre \u00E0 l'utilisateur de t\u00E9l\u00E9charger des fichiers
+usersettings.upload=Permettre \u00E0 l'utilisateur d''envoyer des fichiers
 usersettings.share=Utilisateur autorisé à partager des fichiers avec n'importe qui
-usersettings.coverart=Permettre \u00E0 l''utilisateur de modifier les jaquettes et \u00E9tiquettes
-usersettings.comment=Permettre \u00E0 l''utilisateur de cr\u00E9er et \u00E9diter des commentaires et estimations
-usersettings.podcast=Permettre \u00E0 l''utilisateur de g\u00E9rer les Podcasts
+usersettings.coverart=Permettre \u00E0 l'utilisateur de modifier les jaquettes et \u00E9tiquettes
+usersettings.comment=Permettre \u00E0 l'utilisateur de cr\u00E9er et \u00E9diter des commentaires et estimations
+usersettings.podcast=Permettre \u00E0 l'utilisateur de g\u00E9rer les Podcasts
 usersettings.folderaccess=Autoriser l'accès à ces dossiers de média
 usersettings.username=Identifiant
 usersettings.email=E-mail
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=Chiffrement SMTP
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=Depuis l'adresse
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Règles de scan des dossiers
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties
index d65f742b..6c0e0829 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties
@@ -279,7 +279,7 @@ help.homepage.title=Heimas\u00ED\u00F0a
 help.forum.title=Spjallbor\u00F0
 help.shop.title=V\u00F6rur
 help.contact.title=Hafa Samband
-help.contact.text={0} er \u00FEr\u00F3a\u00F0 og vi\u00F0haldi\u00F0 af Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). Ef \u00FE\u00FA hefur einhverjar spurningar, athugasemdir e\u00F0a till\u00F6gur til \u00FArb\u00F3ta, skaltu fara \u00E1 <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic Spjallbor\u00F0</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Yfirlit
 help.logfile=Tilb\u00FAi\u00F0 Yfirlit er Vista\u00F0 \u00ED {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Einka Stillingar Fyrir {0}
 personalsettings.language=Tungum\u00E1l
@@ -415,6 +418,7 @@ transcodingsettings.step2=Skref 2
 transcodingsettings.step3=Skref 3
 transcodingsettings.add=B\u00E6ta VI\u00F0 transcoding
 transcodingsettings.defaultactive=Venjulegt
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Recommended configuration
 transcodingsettings.noname=Vinsamlegast Sl\u00E1\u00F0u inn Nafn.
 transcodingsettings.nosourceformat=Vinsamlegast veldu til a\u00F0 breyta Fr\u00E1.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties
index f7193675..d84854f8 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties
@@ -279,7 +279,7 @@ help.homepage.title=Homepage
 help.forum.title=Forum
 help.shop.title=Negozio
 help.contact.title=Contatti
-help.contact.text={0} \u00E8 sviluppato e mantenuto da Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). Se hai domande, commenti o suggerimenti per migliorare il programma, visita il <a href="https://www.reddit.com/r/airsonic" target="_blank">Forum di Airsonic</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=Il file di log completo \u00E8 salvato in {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Impostazioni personali per {0}
 personalsettings.language=Lingua
@@ -415,6 +418,7 @@ transcodingsettings.step2=Passo 2
 transcodingsettings.step3=Passo 3
 transcodingsettings.add=Aggiungi transcodifica
 transcodingsettings.defaultactive=Predefinito
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Configurazione consigliata
 transcodingsettings.noname=Per favore specifica un nome.
 transcodingsettings.nosourceformat=Per favore specifica il formato dal quale convertire.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties
index ab48ef37..989aa6a4 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties
@@ -279,7 +279,7 @@ help.homepage.title=\u30DB\u30FC\u30E0\u30DA\u30FC\u30B8
 help.forum.title=\u30D5\u30A9\u30FC\u30E9\u30E0
 help.shop.title=\u30B7\u30E7\u30C3\u30D7
 help.contact.title=\u9023\u7D61\u65B9\u6CD5
-help.contact.text={0} \u306F Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>) \u306B\u3088\u3063\u3066\u958B\u767A\u30FB\u30E1\u30F3\u30C6\u30CA\u30F3\u30B9\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u8CEA\u554F\u3084\u30B3\u30E1\u30F3\u30C8\u3001\u610F\u898B\u3001\u6539\u5584\u6848\u304C\u3042\u308C\u3070 <a href="https://www.reddit.com/r/airsonic" target="_blank">\u30D5\u30A9\u30FC\u30E9\u30E0</a>\u3078\u3069\u3046\u305E\u3002<br /> {0} is developed and maintained by Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). If you have any questions, comments or suggestions for improvements, please visit the <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic Forum</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=\u30ED\u30B0
 help.logfile=\u30ED\u30B0\u306E\u6700\u7D42\u66F4\u65B0\u6642\u9593: {0}
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=\u30E6\u30FC\u30B6 {0} \u306E\u500B\u4EBA\u8A2D\u5B9A
 personalsettings.language=\u8A00\u8A9E
@@ -415,6 +418,7 @@ transcodingsettings.step2=\u7B2C2\u6BB5\u968E
 transcodingsettings.step3=\u7B2C3\u6BB5\u968E
 transcodingsettings.add=\u30C8\u30E9\u30F3\u30B9\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u8A2D\u5B9A\u3092\u8FFD\u52A0
 transcodingsettings.defaultactive=\u30C7\u30D5\u30A9\u30EB\u30C8
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=\u63A8\u5968\u3055\u308C\u308B\u8A2D\u5B9A
 transcodingsettings.noname=\u540D\u524D\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 transcodingsettings.nosourceformat=\u5909\u63DB\u5143\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties
index 0dc396e3..cd9aad4c 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties
@@ -279,7 +279,7 @@ help.homepage.title=\uD648\uD398\uC774\uC9C0
 help.forum.title=\uD3EC\uB7FC
 help.shop.title=\uC0C1\uD488
 help.contact.title=Contact
-help.contact.text={0} is developed and maintained by Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). If you have any questions, comments or suggestions for improvements, please visit the <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic Forum</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=\uB85C\uADF8
 help.logfile=\uB85C\uADF8\uAC00 {0} \uC5D0 \uC815\uC0C1\uC801\uC73C\uB85C \uC800\uC7A5\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title={0} \uC758 \uAC1C\uC778 \uC124\uC815
 personalsettings.language=\uC0AC\uC6A9\uC5B8\uC5B4
@@ -415,6 +418,7 @@ transcodingsettings.step2=2 \uB2E8\uACC4
 transcodingsettings.step3=3 \uB2E8\uACC4
 transcodingsettings.add=\uD30C\uC77C \uBCC0\uD658 \uCD94\uAC00
 transcodingsettings.defaultactive=\uAE30\uBCF8\uAC12
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=\uCD94\uCC9C\uD558\uB294 \uBCC0\uD658 \uBC29\uBC95
 transcodingsettings.noname=\uBCC0\uD658 \uC774\uB984\uC744 \uB2E4\uC2DC \uC9C0\uC815\uD574\uC8FC\uC138\uC694.
 transcodingsettings.nosourceformat=\uC6D0\uBCF8 \uD30C\uC77C \uD0C0\uC785\uC744 \uB2E4\uC2DC \uC9C0\uC815\uD574\uC8FC\uC138\uC694.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties
index e10eb6c4..b241e560 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties
@@ -279,7 +279,7 @@ help.homepage.title=\u0414\u043E\u043C\u0430\u0448\u043D\u0430 \u0441\u0442\u044
 help.forum.title=\u0424\u043E\u0440\u0443\u043C
 help.shop.title=Merchandise
 help.contact.title=\u041A\u043E\u043D\u0442\u0430\u043A\u0442
-help.contact.text={0} \u0435 \u0438\u0437\u0440\u0430\u0431\u043E\u0442\u0435\u043D \u0438 \u0433\u043E \u043E\u0434\u0434\u0436\u0443\u0432\u0430 Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). \u0410\u043A\u043E \u0438\u043C\u0430\u0442\u0435 \u0431\u0438\u043B\u043E \u043A\u0430\u043A\u0432\u0438 \u043F\u0440\u0430\u0448\u0430\u045A\u0430, \u0437\u0430\u0431\u0435\u043B\u0435\u0448\u043A\u0438 \u0438\u043B\u0438 \u0441\u0443\u0433\u0435\u0441\u0442\u0438\u0438 \u0437\u0430 \u043F\u043E\u0434\u043E\u0431\u0440\u0443\u0432\u0430\u045A\u0430, \u0432\u0435 \u043C\u043E\u043B\u0438\u043C\u0435 \u043F\u043E\u0441\u0435\u0442\u0435\u0442\u0435 \u043D\u0435 \u043D\u0430 <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic \u0424\u043E\u0440\u0443\u043C</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=\u041B\u043E\u0433
 help.logfile=The complete log is saved in {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Personal settings for {0}
 personalsettings.language=Language
@@ -415,6 +418,7 @@ transcodingsettings.step2=Step 2
 transcodingsettings.step3=Step 3
 transcodingsettings.add=Add transcoding
 transcodingsettings.defaultactive=Enable transcoding settings for all existing and new players.
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Recommended configuration
 transcodingsettings.noname=Please specify a name.
 transcodingsettings.nosourceformat=Please specify the format to convert from.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties
index c90e4408..499cf22f 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties
@@ -279,7 +279,7 @@ help.homepage.title=Website
 help.forum.title=Forum
 help.shop.title=Merchandise
 help.contact.title=Contact
-help.contact.text=Airsonic is een gemeenschapsproject. Als je vragen, commentaar of suggesties hebt voor verbetering bezoek dan <a href="irc://chat.freenode.net/airsonic">#airsonic op Freenode</a> of <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic op Reddit</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=Het volledige logbestand is opgeslagen in {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=Geen
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=Afzender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Persoonlijke instellingen voor {0}
 personalsettings.language=Taal
@@ -415,6 +418,7 @@ transcodingsettings.step2=Stap 2
 transcodingsettings.step3=Stap 3
 transcodingsettings.add=Voeg conversie toe
 transcodingsettings.defaultactive=Activeer deze conversie voor alle bestaande en nieuwe afspelers.
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Aanbevolen configuratie
 transcodingsettings.noname=Geef een naam op.
 transcodingsettings.nosourceformat=Specificeer het te converteren formaat.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties
index 7693aec5..1aab157e 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties
@@ -279,7 +279,7 @@ help.homepage.title=Heimeside
 help.forum.title=Forum
 help.shop.title=Butikk
 help.contact.title=Kontakt
-help.contact.text={0} er utvikla og vedlikehalde av Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). G\u00E5 til <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic-forumet</a> viss du har sp\u00F8rsm\u00E5l, kommentarar eller forslag til forbetringar.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Logg
 help.logfile=Heile loggen finst i {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Personlege innstillingar for {0}
 personalsettings.language=Spr\u00E5k
@@ -415,6 +418,7 @@ transcodingsettings.step2=Steg 2
 transcodingsettings.step3=Steg 3
 transcodingsettings.add=Legg til transkoding
 transcodingsettings.defaultactive=Standard
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Recommended configuration
 transcodingsettings.noname=Ver venleg og skriv eit namn.
 transcodingsettings.nosourceformat=Skriv formatet det skal konverterast fr\u00E5.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties
index c8771e87..656c9626 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties
@@ -279,7 +279,7 @@ help.homepage.title=Hjemmeside
 help.forum.title=Forum
 help.shop.title=Butikk
 help.contact.title=Kontakt
-help.contact.text={0} er utviklet og vedlikeholdt av Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). Bes\u00F8k <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic Forum</a> hvis du har sp\u00F8rsm\u00E5l, kommentarer eller forslag til forbedringer.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Logg
 help.logfile=Hele loggen finnes i {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Personlige innstillinger for {0}
 personalsettings.language=Spr\u00E5k
@@ -415,6 +418,7 @@ transcodingsettings.step2=Steg 2
 transcodingsettings.step3=Steg 3
 transcodingsettings.add=Legg til transkoding
 transcodingsettings.defaultactive=Standard
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Recommended configuration
 transcodingsettings.noname=Vennligst angi et navn.
 transcodingsettings.nosourceformat=Angi formatet det skal konverteres fra.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties
index ee1751d2..4da1802d 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties
@@ -279,7 +279,7 @@ help.homepage.title=Strona domowa
 help.forum.title=Forum
 help.shop.title=Sklep
 help.contact.title=Kontakt
-help.contact.text={0} jest rozwijany i utrzymywany przez Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). Je\u015Bli masz pytania, uwagi lub sugestie, zapraszam na <a href="https://www.reddit.com/r/airsonic" target="_blank">forum Airsonic</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=Pe\u0142ny log mo\u017Cna odnale\u017A\u0107 w {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Ustawienia osobiste dla {0}
 personalsettings.language=J\u0119zyk
@@ -415,6 +418,7 @@ transcodingsettings.step2=Krok 2
 transcodingsettings.step3=Krok 3
 transcodingsettings.add=Dodaj transkodowanie
 transcodingsettings.defaultactive=Standadrowe
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Zalecana konfiguracja
 transcodingsettings.noname=Prosz\u0119 okre\u015Bli\u0107 nazw\u0119
 transcodingsettings.nosourceformat=Prosz\u0119 okre\u015Bli\u0107 format \u017Ar\u00F3d\u0142owy
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties
index 528dfbbb..46a7cb8b 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties
@@ -279,7 +279,7 @@ help.homepage.title=P\u00E1gina do projecto
 help.forum.title=Forum
 help.shop.title=Merchandise
 help.contact.title=Contacto
-help.contact.text=O {0} \u00E9 desenvolvido e mantido por Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). Se tiver quaisquer perguntas, coment\u00E1rios ou sugest\u00F5es para melhorias, por favor visite o Forum do<a href="https://www.reddit.com/r/airsonic" target="_blank"> Airsonic </a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=O log completo est\u00E1 guardado em {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Configura\u00E7\u00F5es pessoais para o utilizador {0}
 personalsettings.language=Idioma
@@ -415,6 +418,7 @@ transcodingsettings.step2=Passo 2
 transcodingsettings.step3=Passo 3
 transcodingsettings.add=Adicionar transcodifica\u00E7\u00E3o
 transcodingsettings.defaultactive=Padr\u00E3o
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Recommended configuration
 transcodingsettings.noname=Por favor especifique o nome.
 transcodingsettings.nosourceformat=Por favor, especifique o formato para converter de.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_BR.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_BR.properties
index b14e9356..c54a3d18 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_BR.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_BR.properties
@@ -279,7 +279,7 @@ help.homepage.title=Homepage
 help.forum.title=Forum
 help.shop.title=Merchandise
 help.contact.title=Contact
-help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues">issue tracker on GitHub</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=The complete log is saved in {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Personal settings for {0}
 personalsettings.language=Language
@@ -415,6 +418,7 @@ transcodingsettings.step2=Step 2
 transcodingsettings.step3=Step 3
 transcodingsettings.add=Add transcoding
 transcodingsettings.defaultactive=Enable transcoding settings for all existing and new players.
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Recommended configuration
 transcodingsettings.noname=Please specify a name.
 transcodingsettings.nosourceformat=Please specify the format to convert from.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_PT.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_PT.properties
index b14e9356..c54a3d18 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_PT.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_PT.properties
@@ -279,7 +279,7 @@ help.homepage.title=Homepage
 help.forum.title=Forum
 help.shop.title=Merchandise
 help.contact.title=Contact
-help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues">issue tracker on GitHub</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=The complete log is saved in {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Personal settings for {0}
 personalsettings.language=Language
@@ -415,6 +418,7 @@ transcodingsettings.step2=Step 2
 transcodingsettings.step3=Step 3
 transcodingsettings.add=Add transcoding
 transcodingsettings.defaultactive=Enable transcoding settings for all existing and new players.
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Recommended configuration
 transcodingsettings.noname=Please specify a name.
 transcodingsettings.nosourceformat=Please specify the format to convert from.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties
index 5d792c01..a85e79ab 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties
@@ -279,7 +279,7 @@ help.homepage.title=\u0413\u043B\u0430\u0432\u043D\u0430\u044F \u0441\u0442\u044
 help.forum.title=\u0424\u043E\u0440\u0443\u043C
 help.shop.title=Merchandise
 help.contact.title=\u041A\u043E\u043D\u0442\u0430\u043A\u0442\u044B
-help.contact.text={0} \u0440\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u0430 Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). \u043F\u043E \u0432\u0441\u0435\u043C \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u043C \u0438 \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u044F\u043C \u043E\u0431\u0440\u0430\u0449\u0430\u0442\u044C\u0441\u044F \u043D\u0430 <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic \u0424\u043E\u0440\u0443\u043C</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=\u041B\u043E\u0433
 help.logfile=\u041F\u043E\u043B\u043D\u044B\u0439 \u043B\u043E\u0433 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D \u0432 {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=\u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u0435\u043B\u044C
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=\u0412\u043D\u0435\u0448\u043D\u0438\u0439 \u0432\u0438\u0434 \u0434\u043B\u044F {0}
 personalsettings.language=\u042F\u0437\u044B\u043A
@@ -415,6 +418,7 @@ transcodingsettings.step2=\u0428\u0430\u0433 2
 transcodingsettings.step3=\u0428\u0430\u0433 3
 transcodingsettings.add=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u043E\u0440
 transcodingsettings.defaultactive=\u041F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Recommended configuration
 transcodingsettings.noname=\u0423\u043A\u0430\u0436\u0438\u0442\u0435 \u0438\u043C\u044F.
 transcodingsettings.nosourceformat=\u0443\u043A\u0430\u0436\u0438\u0442\u0435 \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties
index 7096b1b3..7803b0ed 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties
@@ -279,7 +279,7 @@ help.homepage.title=Spletna stran
 help.forum.title=Forum
 help.shop.title=Prodaja
 help.contact.title=Kontakt
-help.contact.text={0} je razvil in vzdr\u017Euje Sindre Mehus (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). \u010Ce imate vpra\u0161anja, pripombe ali predloge za izbolj\u0161ave, obi\u0161\u010Dite <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonicov forum</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Dnevnik
 help.logfile=Celotna datoteka z dnevnikom je shranjena v {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Osebne nastavitve za {0}
 personalsettings.language=Jezik
@@ -415,6 +418,7 @@ transcodingsettings.step2=2. korak
 transcodingsettings.step3=3. korak
 transcodingsettings.add=Dodaj prekodiranje
 transcodingsettings.defaultactive=Privzeto
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Priporo\u010Dene nastavitve
 transcodingsettings.noname=Prosimo, dolo\u010Dite ime.
 transcodingsettings.nosourceformat=Prosimo, dolo\u010Dite obliko zapisa vhodne datoteke.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties
index c0fdb116..37dbc17a 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties
@@ -279,7 +279,7 @@ help.homepage.title=Hemsida
 help.forum.title=Forum
 help.shop.title=Handelsvaror
 help.contact.title=Kontakt
-help.contact.text=Airsonic \u00E4r utvecklat och underh\u00E5llet av Sindre Mehus (<a href="mailto:sindre_mehus@users.sourceforge.net">sindre_mehus@users.sourceforge.net</a>). Om du har fr\u00E5gor, kommentarer eller f\u00F6rslag p\u00E5 f\u00F6rb\u00E4ttringar, V\u00E4nligen bes\u00F6k <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonics Forum</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Logg
 help.logfile=Den kompletta loggen \u00E4r sparad i {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Personal inst\u00E4llningar f\u00F6r {0}
 personalsettings.language=Spr\u00E5k
@@ -415,6 +418,7 @@ transcodingsettings.step2=Steg 2
 transcodingsettings.step3=Steg 3
 transcodingsettings.add=L\u00E4gg till transcoding
 transcodingsettings.defaultactive=Standard
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Rekommenderad konfiguration
 transcodingsettings.noname=V\u00E4nligen ange ett namn.
 transcodingsettings.nosourceformat=V\u00E4nligen ange ett format att konvertera fr\u00E5n.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_uk.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_uk.properties
index 42d45f1f..106b4657 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_uk.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_uk.properties
@@ -279,7 +279,7 @@ help.homepage.title=Домашня сторінка
 help.forum.title=Форум
 help.shop.title=Merchandise
 help.contact.title=Contact
-help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues">issue tracker on GitHub</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=Log
 help.logfile=The complete log is saved in {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title=Personal settings for {0}
 personalsettings.language=Мова
@@ -415,6 +418,7 @@ transcodingsettings.step2=Step 2
 transcodingsettings.step3=Step 3
 transcodingsettings.add=Add transcoding
 transcodingsettings.defaultactive=Enable transcoding settings for all existing and new players.
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=Рекомендована конфігурація
 transcodingsettings.noname=Please specify a name.
 transcodingsettings.nosourceformat=Please specify the format to convert from.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=Шифрування SMTP
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties
index a8e24289..ff43038e 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties
@@ -279,7 +279,7 @@ help.homepage.title=\u9996\u9875
 help.forum.title=\u8BBA\u575B
 help.shop.title=\u5546\u54C1
 help.contact.title=\u8054\u7CFB
-help.contact.text={0} \u7531 Sindre Mehus \u5F00\u53D1\u53CA\u7EF4\u62A4 (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). \u5982\u679C\u60A8\u6709\u4EFB\u4F55\u7591\u95EE\uFF0C\u610F\u89C1\u6216\u5EFA\u8BAE\u6539\u5584\uFF0C\u8BF7\u5230 <a href="https://www.reddit.com/r/airsonic" target="_blank">Airsonic\u8BBA\u575B</a>.
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=\u65E5\u5FD7
 help.logfile=\u5B8C\u6574\u7684\u65E5\u5FD7\u5B58\u653E\u5728 {0}.
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=None
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=E-mail sender
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title={0}\u7684\u4E2A\u4EBA\u5316\u8BBE\u7F6E
 personalsettings.language=\u8BED\u8A00
@@ -415,6 +418,7 @@ transcodingsettings.step2=\u6B65\u9AA4\u4E8C
 transcodingsettings.step3=\u6B65\u9AA4\u4E09
 transcodingsettings.add=\u6DFB\u52A0
 transcodingsettings.defaultactive=\u4E3A\u73B0\u6709\u548C\u65B0\u64AD\u653E\u5668\u542F\u7528\u8FD9\u9879\u8F6C\u7801\u8BBE\u7F6E
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=\u63A8\u8350\u8BBE\u7F6E
 transcodingsettings.noname=\u8BF7\u6307\u5B9A\u4E00\u4E2A\u540D\u79F0.
 transcodingsettings.nosourceformat=\u8BF7\u6307\u5B9A\u8F6C\u6362\u683C\u5F0F.
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP Encryption
 helppopup.smtpEncryption.text=<p>Encryption method used for connections to the SMTP server. Choose "None" for no encryption.</p>
 helppopup.smtpFrom.title=From address
 helppopup.smtpFrom.text=<p>The sender address for e-mails originating from the Airsonic server. Must be a valid e-mail address.</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties
index c6304ccb..e881768f 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties
@@ -279,7 +279,7 @@ help.homepage.title=\u9996\u9801
 help.forum.title=\u8AD6\u58C7
 help.shop.title=\u5546\u54C1
 help.contact.title=\u806F\u7E6B
-help.contact.text=Airsonic \u662F\u793E\u7FA4\u5C08\u6848\u3002 \u60A8\u53EF\u4EE5\u5728 <a href="irc://chat.freenode.net/airsonic">Freenode \u4E0A\u7684 #airsonic</a> \u627E\u5230\u6211\u5011\u3002\u6280\u8853\u554F\u984C\u53EF\u4EE5\u63D0\u4EA4\u5230 <a href="https://github.com/airsonic/airsonic/issues" target="_blank">Github \u4E0A\u7684\u554F\u984C\u8FFD\u8E64\u5668</a>\u3002
+help.contact.text=Airsonic is a community project. You can find us in <a href="irc://chat.freenode.net/airsonic">#airsonic on Freenode</a>. Technical issues can be submitted to the <a href="https://github.com/airsonic/airsonic/issues" target="_blank">issue tracker on GitHub</a>.
 help.log=\u8A18\u9304
 help.logfile=\u5B8C\u6574\u7684\u7D00\u9304\u5B58\u653E\u5728 {0}\u3002
 # settingsHeader.jsp
@@ -338,6 +338,9 @@ advancedsettings.smtpEncryption.none=\u7121
 advancedsettings.smtpEncryption.starttls=STARTTLS
 advancedsettings.smtpEncryption.ssl=SSL/TLS
 advancedsettings.smtpFrom=\u5BC4\u4EF6\u8005
+advancedsettings.enableCaptcha=Require CAPTCHA for account recovery
+advancedsettings.recaptchaSiteKey=reCAPTCHA site key
+advancedsettings.recaptchaSecretKey=reCAPTCHA secret key
 # personalSettings.jsp
 personalsettings.title={0} \u7684\u500B\u4EBA\u5316\u8A2D\u5B9A
 personalsettings.language=\u8A9E\u8A00
@@ -415,6 +418,7 @@ transcodingsettings.step2=\u6B65\u9A5F\u4E8C
 transcodingsettings.step3=\u6B65\u9A5F\u4E09
 transcodingsettings.add=\u65B0\u589E\u8F49\u78BC\u5668
 transcodingsettings.defaultactive=\u9810\u8A2D
+transcodingsettings.enableseek=Enable seeking on transcodes (might not work well with VBR codecs)
 transcodingsettings.recommended=\u5EFA\u8B70\u7684\u8A2D\u5B9A
 transcodingsettings.noname=\u8ACB\u6307\u5B9A\u4E00\u500B\u540D\u7A31\u3002
 transcodingsettings.nosourceformat=\u8ACB\u6307\u5B9A\u8F49\u63DB\u7684\u4F86\u6E90\u683C\u5F0F\u3002
@@ -730,6 +734,12 @@ helppopup.smtpEncryption.title=SMTP \u52A0\u5BC6
 helppopup.smtpEncryption.text=<p>\u9023\u63A5 SMTP \u4F3A\u670D\u5668\u6642\u4F7F\u7528\u7684\u52A0\u5BC6\u65B9\u5F0F\u3002\u9078\u64C7\u300CNone\u300D\u5C07\u4E0D\u52A0\u5BC6\u3002</p>
 helppopup.smtpFrom.title=\u4F86\u6E90\u4F4D\u5740
 helppopup.smtpFrom.text=<p>Airsonic \u4F3A\u670D\u5668\u5BC4\u9001\u6642\u4F7F\u7528\u7684\u4F86\u6E90\u4F4D\u5740\u3002\u5FC5\u9808\u662F\u5408\u6CD5\u7684\u96FB\u5B50\u90F5\u4EF6\u4F4D\u5740\u3002</p>
+helppopup.captcha.title=CAPTCHA
+helppopup.captcha.text=<p>When enabled, users must solve a CAPTCHA to prove they are human when requesting a password reset.</p> <p>Requires registration with an external service; see the <a href="https://airsonic.github.io/docs/captcha/">documentation</a>.</p>
+helppopup.recaptchaSiteKey.title=reCAPTCHA site key
+helppopup.recaptchaSiteKey.text=<p>A site key obtained from the reCAPTCHA admin console.</p>
+helppopup.recaptchaSecretKey.title=reCAPTCHA secret key
+helppopup.recaptchaSecretKey.text=<p>A secret key obtained from the reCAPTCHA admin console. Left unchanged if blank.</p>
 helppopup.scanMediaFolders.title=Media folders scanning rules
 helppopup.scanMediaFolders.text=<p>Note that subfolder names starting with a dot (.) or @eaDir, as well as Thumbs.db files, are ignored.</p>
 # wap/index.jsp