diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxTextFormatting.pt_BR.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxTextFormatting.pt_BR.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6098b212f1e812a8378155715e6a60cae9e731c9
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/src/main/resources/XWiki/XWikiSyntaxTextFormatting.pt_BR.xml
@@ -0,0 +1,67 @@
+<?xml version="1.1" encoding="UTF-8"?>
+
+<!--
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+
+<xwikidoc locale="pt-BR">
+  <web>XWiki</web>
+  <name>XWikiSyntaxTextFormatting</name>
+  <language>pt-BR</language>
+  <defaultLanguage>en</defaultLanguage>
+  <translation>1</translation>
+  <parent>XWiki.XWikiSyntax</parent>
+  <creator>xwiki:XWiki.Admin</creator>
+  <author>xwiki:XWiki.Admin</author>
+  <customClass/>
+  <contentAuthor>xwiki:XWiki.Admin</contentAuthor>
+  <version>1.1</version>
+  <title>XWikiSyntaxTextFormatting</title>
+  <defaultTemplate/>
+  <validationScript/>
+  <comment/>
+  <minorEdit>false</minorEdit>
+  <syntaxId>xwiki/2.1</syntaxId>
+  <hidden>true</hidden>
+  <content>= Edição =
+
+== Formatação de texto ==
+
+=== 1.0 Formatação de texto ===
+
+|=Recurso|=Sintaxe do XWiki 1.0|=Resultado
+|Negrito|{{{*negrito*}}}|**negrito**
+|Sublinhado|{{{__sublinhado___}}}|__sublinhado__
+|Itálico|{{{~~itálico~~}}}|//itálico//
+|Riscado|{{{--riscado--}}}|--riscado--
+|Monoespaço|&lt;tt&gt;monoespaço&lt;/tt&gt;|##monoespaço##
+|Sobrescrito|algum &lt;sup&gt;sobrescrito&lt;/sup&gt;|algum ^^sobrescrito^^
+|Subscrito|algum &lt;sub&gt;subscrito&lt;/sub&gt;|algum ,,subscrito,,
+
+=== 2.0 Formatação de texto ===
+
+|=Recurso|=Sintaxe do XWiki {{velocity}}$crtSyntaxVer{{/velocity}}|=Resultado
+|Negrito|{{{**negrito**}}}|**negrito**
+|Sublinhado|{{{__sublinhado__}}}|__sublinhado__
+|Itálico|{{{//itálico//}}}|//itálico//
+|Riscado|{{{--riscado--}}}|--riscado--
+|Monoespaço|{{{##monoespaço##}}}|##monoespaço##
+|Sobrescrito|{{{alguns ^^sobrescrito^^}}}|alguns ^^sobrescrito^^
+|Subscrito|{{{algum ,,subscrito,,}}}|algum ,,subscrito,,</content>
+</xwikidoc>
diff --git a/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/resources/ApplicationResources_uk.properties b/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/resources/ApplicationResources_uk.properties
index b338173992277b376b1afcba68208fc356a0e3c9..134da5259106d977c78f4a6be97e7398c679ad26 100644
--- a/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/resources/ApplicationResources_uk.properties
+++ b/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/resources/ApplicationResources_uk.properties
@@ -17,6 +17,38 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
+admin.edit.realtime=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0438 \u0432 \u0440\u0435\u0436\u0438\u043C\u0456 \u0440\u0435\u0430\u043B\u044C\u043D\u043E\u0433\u043E \u0447\u0430\u0441\u0443
+admin.edit.realtime.description=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u0442\u0438 \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0438 \u0440\u0435\u0430\u043B\u044C\u043D\u043E\u0433\u043E \u0447\u0430\u0441\u0443.
+XWiki.Realtime.ConfigurationClass_useGlobalConfig=\u0413\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u0435 \u043D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F
+XWiki.Realtime.ConfigurationClass_useGlobalConfig.hint=\u0412\u0438\u043A\u043E\u0440\u0438\u0441\u0442\u043E\u0432\u0443\u0439\u0442\u0435 \u043E\u0441\u043D\u043E\u0432\u043D\u0443 \u043A\u043E\u043D\u0444\u0456\u0433\u0443\u0440\u0430\u0446\u0456\u044E \u0432\u0456\u043A\u0456
+XWiki.Realtime.ConfigurationClass_toolbarUserlist=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043F\u0456\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0445 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0456\u0432
+XWiki.Realtime.ConfigurationClass_toolbarUserlist.hint=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u0441\u043F\u0438\u0441\u043E\u043A \u043F\u0456\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0445 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0456\u0432 \u0443 \u0432\u0435\u0440\u0445\u043D\u0456\u0439 \u0447\u0430\u0441\u0442\u0438\u043D\u0456 \u043E\u0431\u043B\u0430\u0441\u0442\u0456 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043D\u043D\u044F
+XWiki.Realtime.ConfigurationClass_toolbarUserlist_name=\u041F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043B\u0438\u0448\u0435 \u0456\u043C\u0435\u043D\u0430 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0456\u0432
+XWiki.Realtime.ConfigurationClass_toolbarUserlist_avatar=\u041F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043B\u0438\u0448\u0435 \u0430\u0432\u0430\u0442\u0430\u0440\u043A\u0438 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0456\u0432
+XWiki.Realtime.ConfigurationClass_toolbarUserlist_both=\u041F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u044F\u043A \u0456\u043C\u0435\u043D\u0430 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0456\u0432, \u0442\u0430\u043A \u0456 \u0457\u0445 \u0430\u0432\u0430\u0442\u0430\u0440\u043A\u0438
+XWiki.Realtime.ConfigurationClass_marginAvatar=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0438 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0456\u0432, \u044F\u043A\u0456 \u0440\u0435\u0434\u0430\u0433\u0443\u044E\u0442\u044C
+XWiki.Realtime.ConfigurationClass_marginAvatar.hint=\u041F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u0437\u0431\u043E\u043A\u0443 \u0432\u0456\u0434 \u043E\u0431\u043B\u0430\u0441\u0442\u0456 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043D\u043D\u044F \u0430\u0432\u0430\u0442\u0430\u0440\u043A\u0438 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0456\u0432, \u044F\u043A\u0456 \u0437\u0430\u0440\u0430\u0437 \u0432\u0432\u043E\u0434\u044F\u0442\u044C \u0442\u0435\u043A\u0441\u0442
+XWiki.Realtime.ConfigurationClass_enableMerge=\u041E\u0431'\u0454\u0434\u043D\u0430\u0442\u0438 \u043F\u0456\u0434 \u0447\u0430\u0441 \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043D\u043D\u044F
+XWiki.Realtime.ConfigurationClass_enableMerge.hint=\u0421\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043E\u0431'\u0454\u0434\u043D\u0430\u0442\u0438 \u0432\u043C\u0456\u0441\u0442 \u043F\u0456\u0434 \u0447\u0430\u0441 \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043D\u043D\u044F \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430 (\u0432\u0438\u043C\u043A\u043D\u0456\u0442\u044C, \u043B\u0438\u0448\u0435 \u044F\u043A\u0449\u043E \u0446\u0435 \u0441\u043F\u0440\u0438\u0447\u0438\u043D\u044F\u0454 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0438)
+# ---------------------------------------------------------------------------
+# See the NOTICE file distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+# ---------------------------------------------------------------------------
 realtime.editingAlone=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043D\u043D\u044F \u0441\u0430\u043C\u043E\u0441\u0442\u0456\u0439\u043D\u043E
 realtime.editingWith=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043D\u043D\u044F \u0437:
 realtime.disconnected=\u0412\u0456\u0434'\u0454\u0434\u043D\u0430\u043D\u043E
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ru.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ru.xml
index 4ebf729dbca7683a2cb07c514e3b1d70f6488941..b05f9868a03a3c2e323fb1c8a4c9f3569f509307 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ru.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ru.xml
@@ -231,9 +231,57 @@
 notifications.switches.tooltip.wiki=Наблюдение за всей Вики
 notifications.switches.changeStatusError=Не удалось изменить состояние уведомлений.
 
-## Used to indicate where deprecated keys start
-#@deprecatedstart
+## Watch button and modal
 
+notifications.watch.button.title=Текущая настройка уведомлений для этой страницы: {0} - Нажмите, чтобы изменить
+notifications.watch.button.status.notset=Не установлено
+notifications.watch.button.status.followed=Отслеживание
+notifications.watch.button.status.blocked=Заблокировано
+notifications.watch.button.status.custom=Особо
+notifications.watch.modal.title=Настройки уведомлений для этой страницы
+notifications.watch.modal.description.options=Вы можете изменить текущие настройки уведомлений с помощью следующих опций: 
+notifications.watch.modal.description.ancestoroption=Вы можете либо перейти в раздел {0} и изменить настройки уведомлений там, либо напрямую применить настройки на текущей странице с помощью следующих опций: 
+notifications.watch.modal.title.WATCHED_FOR_ALL_EVENTS_AND_FORMATS=Настройки наблюдения за страницей
+notifications.watch.modal.description.WATCHED_FOR_ALL_EVENTS_AND_FORMATS=Вы следите за этой страницей: вы будете получать уведомления о ней.
+notifications.watch.modal.title.WATCHED_BY_ANCESTOR_FOR_ALL_EVENTS_AND_FORMATS=Настройки наблюдения за родительской страницей
+notifications.watch.modal.description.WATCHED_BY_ANCESTOR_FOR_ALL_EVENTS_AND_FORMATS=Вы следите за этой страницей через родителя в иерархии: вы будете получать уведомления о ней.
+notifications.watch.modal.title.WATCHED_WITH_CHILDREN_FOR_ALL_EVENTS_AND_FORMATS=Настройки наблюдения за страницей и дочерними страницами
+notifications.watch.modal.description.WATCHED_WITH_CHILDREN_FOR_ALL_EVENTS_AND_FORMATS=Вы следите за этой страницей и ее дочерними страницами: вы будете получать уведомления о них.
+notifications.watch.modal.title.NOT_SET=Настройки наблюдения не заданы
+notifications.watch.modal.description.NOT_SET=Вы еще не настроили параметры просмотра этой страницы, поэтому вы не следите за ней: вы не будете получать уведомления о ней.
+notifications.watch.modal.title.BLOCKED_FOR_ALL_EVENTS_AND_FORMATS=Настройки наблюдения за заблокированными страницами
+notifications.watch.modal.description.BLOCKED_FOR_ALL_EVENTS_AND_FORMATS=Вы игнорируете эту страницу: вы не будете получать никаких уведомлений о ней.
+notifications.watch.modal.title.BLOCKED_BY_ANCESTOR_FOR_ALL_EVENTS_AND_FORMATS=Настройки наблюдения за заблокированной родительской страницей
+notifications.watch.modal.description.BLOCKED_BY_ANCESTOR_FOR_ALL_EVENTS_AND_FORMATS=Вы игнорируете эту страницу через родителя в иерархии: вы не будете получать за нее никаких уведомлений.
+notifications.watch.modal.title.BLOCKED_WITH_CHILDREN_FOR_ALL_EVENTS_AND_FORMATS=Настройки наблюдения за заблокированной страницей и ее дочерними
+notifications.watch.modal.description.BLOCKED_WITH_CHILDREN_FOR_ALL_EVENTS_AND_FORMATS=Вы игнорируете эту страницу и ее дочерние страницы: вы не будете получать уведомления о ней.
+notifications.watch.modal.title.CUSTOM=Индивидуальные настройки наблюдения
+notifications.watch.modal.description.CUSTOM=Вы используете особые настройки уведомлений для этой страницы: возможно, вы следите или блокируете определенные события для этой страницы или нацеливаете уведомления только на определенные каналы. Мы приглашаем вас просмотреть настройки уведомлений в вашем профиле.
+notifications.watch.modal.option.watchpage.title=Следить за текущей страницей
+### Missing: notifications.watch.modal.option.watchpage.hint=You will receive notifications for that page only.
+### Missing: notifications.watch.modal.option.watchspace.title=Follow current page and its children
+### Missing: notifications.watch.modal.option.watchspace.hint=You will receive notifications for that page and its children.
+### Missing: notifications.watch.modal.option.watchwiki.title=Follow entire wiki
+### Missing: notifications.watch.modal.option.watchwiki.hint=This option doesn't only impact current page or space: you will receive notifications for any page in the wiki.
+### Missing: notifications.watch.modal.option.blockpage.title=Block current page
+### Missing: notifications.watch.modal.option.blockpage.hint=You will block any notifications for that page only.
+### Missing: notifications.watch.modal.option.blockspace.title=Block current page and its children
+### Missing: notifications.watch.modal.option.blockspace.hint=You will block any notifications for that page and all of its children.
+### Missing: notifications.watch.modal.option.unwatchpage.title=Unfollow current page
+### Missing: notifications.watch.modal.option.unwatchpage.hint=You will stop receiving notifications for that page only.
+### Missing: notifications.watch.modal.option.unwatchspace.title=Unfollow current page and its children
+### Missing: notifications.watch.modal.option.unwatchspace.hint=You will stop receiving notifications for that page and its children.
+### Missing: notifications.watch.modal.option.unwatchwiki.title=Unfollow entire wiki
+### Missing: notifications.watch.modal.option.unwatchwiki.hint=This option doesn't only impact current page or space: you will stop receiving notifications for any page in the wiki.
+### Missing: notifications.watch.modal.option.unblockpage.title=Unblock current page
+### Missing: notifications.watch.modal.option.unblockpage.hint=You will receive notifications for that page only.
+### Missing: notifications.watch.modal.option.unblockspace.title=Unblock current page and its children
+### Missing: notifications.watch.modal.option.unblockspace.hint=You will receive notifications for that page and its children.
+### Missing: notifications.watch.modal.option.unblockwiki.title=Unblock entire wiki
+### Missing: notifications.watch.modal.option.unblockwiki.hint=This option doesn't only impact current page or space: you will stop ignoring notifications for any page in the wiki.
+### Missing: notifications.watch.modal.close=Close without saving
+### Missing: notifications.watch.modal.savechanges=Save changes
+### Missing: notifications.watch.modal.gotosettings=Manage all notifications settings
 ## until 13.2RC1
 notifications.settings.filters.preferences.title=Фильтры
 notifications.settings.filters.preferences.hint=Создайте фильтры, чтобы более точно контролировать, когда события должны создавать уведомления.
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_pt_BR.properties b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_pt_BR.properties
index 1f1813afe9750a3c6990605b645f2edc680a26bc..39e016349aca5867a1c744d246f78989f1de9c74 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_pt_BR.properties
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_pt_BR.properties
@@ -50,7 +50,7 @@
 ###############################################################################
 
 ### Languages
-language=Idioma
+language=Linguagem
 languages=Idiomas
 chinese=Chin\u00EAs
 english=Ingl\u00EAs
@@ -1235,9 +1235,9 @@ core.editors.object.add.submit=Adicionar
 core.editors.object.add.inProgress=Criando objeto...
 core.editors.object.add.done=Objeto criado
 core.editors.object.add.failed=Falha\:
-core.editors.object.loadObject.inProgress=Carregando informa\u00E7\u00F5es do objeto...
-core.editors.object.loadObject.done=Objeto carregado
-core.editors.object.loadObject.failed=O carregamento do objeto falhou:
+core.editors.object.loadObject.inProgress=Carregando informa\u00E7\u00E3o do objeto...
+core.editors.object.loadObject.done=Informa\u00E7\u00E3o do Objeto carregada
+core.editors.object.loadObject.failed=Falha ao carregar informa\u00E7\u00E3o do objeto:
 core.editors.object.add.invalidClassName=A classe {0} n\u00E3o existe
 core.editors.object.newObjectForClass=Novo objeto {0}
 core.editors.object.newObjectForClass.tooltip=Novo objeto {0}
@@ -1851,7 +1851,7 @@ rendering.macro.code.parameter.image.name=imagem
 rendering.macro.code.parameter.image.description=Uma imagem a ser exibida na caixa de mensagem
 rendering.macro.code.parameter.title.name=t\u00EDtulo
 rendering.macro.code.parameter.title.description=Um t\u00EDtulo a ser exibido na caixa de mensagem
-rendering.macro.code.parameter.width.name=width
+rendering.macro.code.parameter.width.name=largura
 rendering.macro.code.parameter.width.description=(Opcional) largura da caixa, expressa em px ou %
 rendering.macro.context.name=Contexto
 rendering.macro.context.description=Executa um documento no contexto de outro documento informado
@@ -1983,17 +1983,17 @@ rendering.macro.messageSender.parameter.visibilityParameter.name=par\u00E2metro
 rendering.macro.messageSender.parameter.visibilityParameter.description=Alguns n\u00EDveis de visibilidade (como 'user' e 'group') aceitam um par\u00E2metro. No caso de 'user' e 'group', por exemplo, o valor pode ser uma refer\u00EAncia em s\u00E9rie de um documento de usu\u00E1rio ou de grupo.
 rendering.macro.messageSender.parameter.visibilityOptions.name=op\u00E7\u00F5es de visibilidade
 rendering.macro.messageSender.parameter.visibilityOptions.description=Lista separada por v\u00EDrgulas, das op\u00E7\u00F5es de visibilidade que a macro deve permitir ao usu\u00E1rio escolher.\nTem que ser um subconjunto, podendo ser todas, daquelas que s\u00E3o as padr\u00F5es: 'everyone', 'followers', 'group', 'user'.
-### Missing: rendering.macro.async.name=Async macro
-### Missing: rendering.macro.async.description=Execute asynchronously and/or cache the macro content.
-### Missing: rendering.macro.async.content.description=The wiki content to execute.
+rendering.macro.async.name=Macro ass\u00EDncrona
+rendering.macro.async.description=Execute de forma ass\u00EDncrona e/ou armazene em cache o conte\u00FAdo da macro.
+rendering.macro.async.content.description=O conte\u00FAdo do wiki a ser executado.
 ### Missing: rendering.macro.async.parameter.async.name=Async
-### Missing: rendering.macro.async.parameter.async.description=Enable or disable asynchronous execution
-### Missing: rendering.macro.async.parameter.cached.name=Cached
-### Missing: rendering.macro.async.parameter.cached.description=Enable or disable caching of the result of the macro content execution
-### Missing: rendering.macro.async.parameter.contextEntries.name=Context entries
-### Missing: rendering.macro.async.parameter.contextEntries.description=The list of context elements needed for the execution (wiki, user, locale, request.base, doc.reference...)
-### Missing: rendering.macro.async.parameter.id.name=Id override
-### Missing: rendering.macro.async.parameter.id.description=A unique id is automatically generated by default but it's possible to provide a custom one if needed
+rendering.macro.async.parameter.async.description=Habilitar ou desabilitar a execu\u00E7\u00E3o ass\u00EDncrona
+rendering.macro.async.parameter.cached.name=Em cache
+rendering.macro.async.parameter.cached.description=Habilitar ou desabilitar o cache do resultado da execu\u00E7\u00E3o do conte\u00FAdo da macro
+rendering.macro.async.parameter.contextEntries.name=Entradas de contexto
+rendering.macro.async.parameter.contextEntries.description=A lista de elementos de contexto necess\u00E1rios para a execu\u00E7\u00E3o (wiki, usu\u00E1rio, localidade, request.base, doc.reference...)
+rendering.macro.async.parameter.id.name=Substitui\u00E7\u00E3o de ID
+rendering.macro.async.parameter.id.description=Um ID exclusivo \u00E9 gerado automaticamente por padr\u00E3o, mas \u00E9 poss\u00EDvel fornecer um personalizado, se necess\u00E1rio
 
 ####################
 # Async
@@ -2002,13 +2002,13 @@ rendering.macro.messageSender.parameter.visibilityOptions.description=Lista sepa
 ### Missing: rendering.async.context.entry.author=Author
 ### Missing: rendering.async.context.entry.doc.reference=Document
 ### Missing: rendering.async.context.entry.wiki=Wiki
-### Missing: rendering.async.context.entry.secureDocument=Secure document
-### Missing: rendering.async.context.entry.request.parameters=Request parameters
-### Missing: rendering.async.context.entry.request.url=Request URL
-### Missing: rendering.async.context.entry.request.base=Request base URL
-### Missing: rendering.async.context.entry.request.wiki=Request wiki
-### Missing: rendering.async.context.entry.request.contextpath=Request context path
-### Missing: rendering.async.context.entry.locale=Language
+rendering.async.context.entry.secureDocument=Documento seguro
+rendering.async.context.entry.request.parameters=Par\u00E2metros de solicita\u00E7\u00E3o
+rendering.async.context.entry.request.url=Solicitar URL
+rendering.async.context.entry.request.base=Solicitar URL base
+rendering.async.context.entry.request.wiki=Solicitar wiki
+rendering.async.context.entry.request.contextpath=Solicitar caminho de contexto
+rendering.async.context.entry.locale=Linguagem
 ### Missing: rendering.async.context.entry.action=Action
 ### Missing: rendering.async.context.entry.user=User
 rendering.async.error.failed=Falha ao executar conte\u00FAdo ass\u00EDncrono
@@ -2144,9 +2144,9 @@ core.tags.remove.tooltip=Remover esse marcador do documento
 core.tags.remove.error.notFound=Esse marcador n\u00E3o existe
 core.tags.remove.error.notAllowed=Voc\u00EA n\u00E3o tem permiss\u00E3o de remover marcadores desse documento
 core.tags.remove.error.failed=Falhou ao remover o marcador "{0}" por um erro interno do servidor
-### Missing: core.tags.adding=Adding tag...
-### Missing: core.tags.deleting=Deleting tag...
-### Missing: core.tags.fetchform=Fetching form...
+core.tags.adding=Adicionando etiqueta...
+core.tags.deleting=Excluindo etiqueta...
+core.tags.fetchform=Buscando formul\u00E1rio...
 xe.tag.paramerror=N\u00E3o use o par\u00E2metro "espa\u00E7o" e "espa\u00E7os" ao mesmo tempo
 
 ### Page footer
@@ -2314,7 +2314,7 @@ admin.colortheme.wikiSetting=A paleta de cores configurada no n\u00EDvel da wiki
 admin.colortheme.manage=Gerenciar paleta de cores\u00BB
 admin.customize=Modificar
 admin.save=Salvar
-### Missing: admin.defaultwikinotinstalled_useflavor=Your wiki seems empty. You may want to {0}install a flavor{1}, it will bring you a lot of features: user profiles, recent activity, administration pages and many more.
+admin.defaultwikinotinstalled_useflavor=Seu wiki parece vazio. Voc\u00EA pode querer {0}instalar uma varia\u00E7\u00E3o{1}, ela trar\u00E1 v\u00E1rios recursos: perfis de usu\u00E1rio, atividades recentes, p\u00E1ginas de administra\u00E7\u00E3o e muito mais.
 admin.adminappnotinstalled=A aplica\u00E7\u00E3o de administra\u00E7\u00E3o n\u00E3o foi instalada. Desde a XWiki Enterprise 1.5 a Administra\u00E7\u00E3o \u00E9 distribu\u00EDda como uma aplica\u00E7\u00E3o. Voc\u00EA pode baix\u00E1-la de {0}.
 admin.preferences.title=Prefer\u00EAncias
 
@@ -2325,8 +2325,8 @@ xe.admin.accountvalidation.failure=Houve um problema na valida\u00E7\u00E3o da s
 xe.admin.groups.member=Usu\u00E1rio
 ### Missing: xe.admin.groups.type=Type
 ### Missing: xe.admin.groups.type.user=User
-### Missing: xe.admin.groups.type.group=Group
-### Missing: xe.admin.groups.scope=Scope
+xe.admin.groups.type.group=Grupo
+xe.admin.groups.scope=Escopo
 xe.admin.groups._actions=A\u00E7\u00F5es
 xe.admin.groups._actions.delete=Remover
 xe.admin.groups.addUser=Usu\u00E1rio a serem adicionados
@@ -2336,24 +2336,24 @@ xe.admin.groups.addSuccess=Membros adicionados com sucesso
 xe.admin.groups.addFailure=Falha ao adicionar membros ao grupo\:
 xe.admin.groups.filter.groupName=Filtro por nome de grupo
 xe.admin.groups.filter.scope=Escopo do grupo
-### Missing: web.groups.administration.groupsIgnored=Members successfully added but some groups have been ignored ({0})
+web.groups.administration.groupsIgnored=Membros adicionados com sucesso, mas alguns grupos foram ignorados ({0})
 xe.admin.groups.loading=Carregando...
-### Missing: xe.admin.groups.name=Group Name
+xe.admin.groups.name=Nome do grupo
 xe.admin.groups.members=Membros
 xe.admin.groups.manage=Gerenciar
 xe.admin.groups.local=Local
 xe.admin.groups.global=Global
 xe.admin.groups.both=Ambos
 xe.admin.groups.create=Criar um novo grupo
-### Missing: xe.admin.groups.create.inProgress=Creating the group...
-### Missing: xe.admin.groups.create.done=Group created
-### Missing: xe.admin.groups.create.failed=Failed to create the group
+xe.admin.groups.create.inProgress=Criando o grupo...
+xe.admin.groups.create.done=Grupo criado
+xe.admin.groups.create.failed=Falha ao criar o grupo
 xe.admin.groups.creategroup=Criar grupo
-### Missing: xe.admin.groups.editGroup=Edit group
-### Missing: xe.admin.groups.deleteGroup=Delete group
-### Missing: xe.admin.groups.delete.inProgress=Deleting the group...
-### Missing: xe.admin.groups.delete.done=Group deleted
-### Missing: xe.admin.groups.delete.failed=Failed to delete the group
+xe.admin.groups.editGroup=Editar grupo
+xe.admin.groups.deleteGroup=Excluir grupo
+xe.admin.groups.delete.inProgress=Excluindo o grupo...
+xe.admin.groups.delete.done=Grupo exclu\u00EDdo
+xe.admin.groups.delete.failed=Falha ao excluir o grupo
 xe.admin.groups.currentgroups=Grupos existentes
 xe.admin.groups.administration=Documentos de administra\u00E7\u00E3o de grupos da XWiki
 xe.admin.groups._avatar=Foto
@@ -2371,20 +2371,20 @@ xe.admin.users.administration=Documentos de administra\u00E7\u00E3o de usu\u00E1
 xe.admin.users.sheet=Folha de Usu\u00E1rio
 xe.admin.users.applyonusers=Essa folha de estilo deve ser aplicada em um documento contendo um objeto do tipo XWiki.XWikiUsers.
 ### Missing: xe.admin.users.name=User
-### Missing: xe.admin.users.first_name=First Name
-### Missing: xe.admin.users.last_name=Last Name
-### Missing: xe.admin.users.scope=Scope
+xe.admin.users.first_name=Primeiro nome
+xe.admin.users.last_name=Sobrenome
+xe.admin.users.scope=Escopo
 ### Missing: xe.admin.users._actions=Actions
-### Missing: xe.admin.users._actions.disable=Disable
-### Missing: xe.admin.users._actions.enable=Enable
-### Missing: xe.admin.users.editUser=Edit user
+xe.admin.users._actions.disable=Desativar
+xe.admin.users._actions.enable=Habilitar
+xe.admin.users.editUser=Editar usu\u00E1rio
 ### Missing: xe.admin.users.deleteUser=Delete user
-### Missing: xe.admin.users.delete.inProgress=Deleting the user\u2026
-### Missing: xe.admin.users.delete.done=User deleted
-### Missing: xe.admin.users.delete.failed=Failed to delete the user
-### Missing: xe.admin.users.create.inProgress=Creating the user\u2026
-### Missing: xe.admin.users.create.done=User created
-### Missing: xe.admin.users.create.failed=Failed to create the user
+xe.admin.users.delete.inProgress=Excluindo o usu\u00E1rio\u2026
+xe.admin.users.delete.done=Usu\u00E1rio exclu\u00EDdo
+xe.admin.users.delete.failed=Falha ao excluir o usu\u00E1rio
+xe.admin.users.create.inProgress=Criando o usu\u00E1rio\u2026
+xe.admin.users.create.done=Usu\u00E1rio criado
+xe.admin.users.create.failed=Falha ao criar o usu\u00E1rio
 
 ### User profile management
 platform.user.profileConfigureSectionsTitle=Se\u00E7\u00F5es exibidas
@@ -2464,7 +2464,7 @@ xe.admin.registration.passwordMismatch=As senhas n\u00E3o batem.
 xe.admin.registration.invalidEmail=Por favor entre um endere\u00E7o de email v\u00E1lido.
 xe.admin.registration.youCanConfigureRegistrationHere=Voc\u00EA pode configurar essa aplica\u00E7\u00E3o clicando aqui.
 xe.admin.registration.youCanConfigureRegistrationFieldsHere=Voc\u00EA pode adicionar, remover e mudar campos desse formul\u00E1rio clicando aqui.
-### Missing: xe.admin.registration.fieldWithNoName=ERROR: Field with no name.
+xe.admin.registration.fieldWithNoName=ERRO: Campo sem nome.
 
 ### Attachment picker macro
 xe.attachmentSelector.gallery.title=Anexos
@@ -2858,10 +2858,10 @@ platform.index.doc.date=Data
 platform.index.doc.author=\u00DAltimo Autor
 platform.index.doc.title=T\u00EDtulo
 platform.index.doc.fullName=Nome Completo
-### Missing: platform.index.doc.objectCount=Object Count
+platform.index.doc.objectCount=Contagem de objetos
 platform.index._actions=A\u00E7\u00F5es
 ### Missing: platform.index.emptyvalue=
-### Missing: platform.index._likes=Likes
+platform.index._likes=Curtidos
 
 ### Livetable Column Labels (translationPrefix == "platform.index.attachments.")
 platform.index.attachments.filename=Arquivo
@@ -2928,15 +2928,15 @@ platform.livetable._actions.rights=permiss\u00F5es
 platform.livetable._actions.copy=copiar
 platform.livetable._actions.edit=editar
 ### Missing: platform.livetable.asyncActionInProgress=In progress...
-### Missing: platform.livetable.asyncActionDone=Done
-### Missing: platform.livetable.asyncActionFailed=Failed
+platform.livetable.asyncActionDone=Feito
+platform.livetable.asyncActionFailed=Fracassado
 platform.livetable.filtersTitle=Filtro para a coluna {0}
 platform.livetable.filter.date.format.description=Formato do intervalo de datas: {0}
 platform.livetable.loading=Carregando...
 platform.livetable.tagsHelp=Clicar em um ou mais marcadores para filtrar a lista
 platform.livetable.tagsHelpCancel=e clicar novamente num marcador para cancelar o filtro
 platform.livetable.environmentCannotLoadTableMessage=O ambiente impede a tabela de carregar dados.
-### Missing: platform.livetable.docTitleComputedHint=Some pages have a computed title. Filtering and sorting by title will not work as expected for these pages.
+platform.livetable.docTitleComputedHint=Algumas p\u00E1ginas t\u00EAm um t\u00EDtulo calculado. Filtrar e classificar por t\u00EDtulo n\u00E3o funcionar\u00E1 conforme o esperado para essas p\u00E1ginas.
 platform.livetable.docNotViewable=N/A
 platform.livetable.pagesizeLabel=por p\u00E1gina de
 platform.livetable.selectPageSize.label=Selecione o tamanho da p\u00E1gina
@@ -3073,7 +3073,7 @@ XWiki.TemplateProviderClass_type_page=P\u00E1gina
 XWiki.TemplateProviderClass_type_space=P\u00E1gina inicial do espa\u00E7o
 XWiki.TemplateProviderClass_action_edit=Editar
 XWiki.TemplateProviderClass_action_saveandedit=Salvar e Editar
-### Missing: XWiki.TemplateProviderClass_action_saveandview=Save and View
+XWiki.TemplateProviderClass_action_saveandview=Salvar e visualizar
 admin.templates=Modelos
 admin.templates.description=Configura\u00E7\u00E3o e cria\u00E7\u00E3o de modelos para documentos.
 admin.templates.providerslist=Provedores Dispon\u00EDveis de Modelos
@@ -3115,9 +3115,9 @@ Panels.PanelClass_type=Tipo de painel
 Panels.PanelClass_description=Descri\u00E7\u00E3o
 Panels.PanelClass_content=Conte\u00FAdo
 Panels.PanelClass_category=Categoria
-### Missing: Panels.PanelClass_async_enabled=Asynchronous rendering
-### Missing: Panels.PanelClass_async_cached=Cached
-### Missing: Panels.PanelClass_async_context=Context elements
+Panels.PanelClass_async_enabled=Renderiza\u00E7\u00E3o ass\u00EDncrona
+Panels.PanelClass_async_cached=Em cache
+Panels.PanelClass_async_context=Elementos de contexto
 
 ### XWiki.AggregatorURLClass (watch application)
 XWiki.AggregatorURLClass_name=Nome
@@ -3627,7 +3627,7 @@ extensions.install.list.upgrade=As seguintes extens\u00F5es v\u00E3o ser atualiz
 extensions.install.list.downgrade=As seguintes extens\u00F5es v\u00E3o ser substitu\u00EDdas por uma vers\u00E3o anterior\:
 extensions.install.list.uninstall=As seguintes extens\u00F5es v\u00E3o ser removidas\:
 extensions.install.list.repair=As seguintes extens\u00F5es ser\u00E3o reparadas:
-### Missing: extensions.install.list.top=The following extensions dependencies will be made top level:
+extensions.install.list.top=As seguintes depend\u00EAncias de extens\u00F5es ser\u00E3o de n\u00EDvel superior:
 extensions.upgrade.mergeConflict.label=Conflito de fus\u00E3o
 extensions.upgrade.mergeConflict.hint=O documento {0} tem mudan\u00E7as que n\u00E3o puderam ser substitu\u00EDdas durante a atualiza\u00E7\u00E3o.
 extensions.upgrade.mergeConflict.versionToKeep.next=Manter a nova vers\u00E3o do documento (todas as suas mudan\u00E7as ser\u00E3o perdidas)
@@ -3655,7 +3655,7 @@ extensions.search.all.label=Todas as extens\u00F5es
 extensions.search.more.label=Mais
 extensions.search.recommended.label=Apenas recomendado
 extensions.search.recommended.tooltip=Mostrar apenas extens\u00F5es explicitamente recomendadas pela comunidade XWiki.
-### Missing: extensions.search.recommended.fallback=No recommended extension could be found matching ''{0}'', displaying results of the search in all extensions.
+extensions.search.recommended.fallback=Nenhuma extens\u00E3o recomendada foi encontrada correspondente a ''{0}'', exibindo resultados da pesquisa em todas as extens\u00F5es.
 extensions.search.recommended.all.label=Todas as extens\u00F5es recomendadas
 
 ###############################################################################
@@ -3671,14 +3671,14 @@ extensions.search.recommended.all.label=Todas as extens\u00F5es recomendadas
 #######################################
 
 extensions.search.recommended.disclaimer=Este resultado inclui apenas extens\u00F5es recomendadas.
-### Missing: extensions.search.indexed.label=Indexed
+extensions.search.indexed.label=Indexado
 extensions.search.indexed.tooltip=Pesquisar no \u00EDndice local ou diretamente nos reposit\u00F3rios de extens\u00F5es configurados.
-### Missing: extensions.search.indexed.disclaimer=This only includes indexed extensions.
+extensions.search.indexed.disclaimer=Isso inclui apenas extens\u00F5es indexadas.
 extensions.search.indexed.started=\u00CDndice iniciado em {0}.
 extensions.search.indexed.on=Indexado em {0}.
-### Missing: extensions.search.indexed.nojob=Could not find any previous indexation processing.
-### Missing: extensions.search.indexed.reindex=Reindex
-### Missing: extensions.search.indexed.refresh=Refresh
+extensions.search.indexed.nojob=N\u00E3o foi poss\u00EDvel encontrar nenhum processamento de indexa\u00E7\u00E3o anterior.
+extensions.search.indexed.reindex=Reindexar
+extensions.search.indexed.refresh=Atualizar
 extensions.search.compatible.label=Compat\u00EDvel apenas
 extensions.search.compatible.tooltip=Mostrar apenas a extens\u00E3o que pode ser instalada na wiki atual.
 extensions.search.compatible.all.label=Todas as extens\u00F5es compat\u00EDveis
@@ -3757,7 +3757,7 @@ platform.extension.updater.invalidExtensionsLabel=Extens\u00F5es inv\u00E1lidas
 platform.extension.updater.invalidExtensionsHint=As seguintes extens\u00F5es de {0} devem se atualizadas ou desinstaladas para poderem funcionar corretamente em sua distribui\u00E7\u00E3o\:
 platform.extension.updater.outdatedExtensionsLabel=Extens\u00F5es desatualizadas
 platform.extension.updater.outdatedExtensionsHint=As seguintes extens\u00F5es de {0} podem ser atualizadas\:
-### Missing: platform.extension.updater.pagingrestart=The list of extensions has been changed; showing first page of the changed list.
+platform.extension.updater.pagingrestart=A lista de extens\u00F5es foi alterada; mostrando a primeira p\u00E1gina da lista alterada.
 platform.extension.distributionWizard.stepHeading={0,choice,0\#|0<Passo {0} \u2014 } {1}
 platform.extension.distributionWizard.unknownStepError=Passo desconhecido
 platform.extension.distributionWizard.continueLabel=Continuar
@@ -3829,7 +3829,7 @@ platform.extension.distributionWizard.flavorStepCurrentFlavorInvalidError=O Flav
 platform.extension.distributionWizard.flavorStepInvalidCurrentFlavorUpgradeLabel=Tente encontrar uma vers\u00E3o v\u00E1lida
 platform.extension.distributionWizard.flavorStepInvalidCurrentFlavorUpgradeHint=Vamos tentar encontrar uma vers\u00E3o diferente do mesmo Flavor que seja compat\u00EDvel com a distribui\u00E7\u00E3o atual.
 platform.extension.distributionWizard.flavorStepInvalidCurrentFlavorOrInstallNewLabel=Ou instale um novo Flavor
-### Missing: platform.extension.distributionWizard.flavorStepInvalidCurrentFlavorOrInstallNewHint=If you want to use a different flavor or the current flavor is not maintained anymore and don't have more compatible candidate you can select one of the available flavors.
+platform.extension.distributionWizard.flavorStepInvalidCurrentFlavorOrInstallNewHint=Caso queira usar um sabor diferente ou o sabor atual n\u00E3o seja mais mantido e n\u00E3o tenha candidato mais compat\u00EDvel voc\u00EA pode selecionar um dos sabores dispon\u00EDveis.
 platform.extension.distributionWizard.flavorStepInvalidCurrentFlavorInstallNewLabel=Instale um novo Flavor
 platform.extension.distributionWizard.flavorStepInvalidCurrentFlavorInstallNewHint=Escolha um dos Flavors v\u00E1lidos encontrados nos reposit\u00F3rios configurados
 platform.extension.distributionWizard.flavorStepInvalidCurrentFlavorNoUpgradeError=N\u00E3o foi poss\u00EDvel encontrar nenhuma vers\u00E3o v\u00E1lida para a varia\u00E7\u00E3o "{0}".
@@ -3847,27 +3847,27 @@ platform.extension.distributionWizard.wikiflavorsStepDescription=Os seguintes wi
 platform.extension.distributionWizard.extension.outdatedextensionsStepTitle=Extens\u00F5es
 platform.extension.distributionWizard.extension.outdatedextensionsStepSummary=Atualize as extens\u00F5es instaladas
 platform.extension.distributionWizard.extensionsStepDescription=Extens\u00F5es fornecem fun\u00E7\u00F5es adicionais para a XWiki. Elas s\u00E3o distribu\u00EDdas em arquivos XAR (p. ex. {0} Aplica\u00E7\u00F5es XWiki{1}, {2}macros xwiki {3}, {4}Paletas de Cores{5}) e arquivos JAR (c\u00F3digo que roda no servidor especialmente {6}componentes{7} e {8}servi\u00E7os em script{9}).
-### Missing: platform.extension.distributionWizard.extension.cleanStepTitle=Orphaned dependencies
-### Missing: platform.extension.distributionWizard.extension.cleanStepSummary=Make sure orphaned extension dependencies are either removed or made top level.
-### Missing: platform.extension.distributionWizard.extension.cleanStep.noOrphaned=No orphaned dependency could be found in that instance.
-### Missing: platform.extension.distributionWizard.extension.cleanStep.orphaned=The following extensions have been installed as dependencies and are no longer required. You can either uninstall them (checked) or make them top level extensions if you still need them (unchecked).
-### Missing: platform.extension.distributionWizard.extension.cleanStep.button.cleanapply=Continue
-### Missing: platform.extension.distributionWizard.extension.cleanStep.button.cleanapplyfinalize=Continue
-### Missing: platform.extension.distributionWizard.extension.cleanStep.button.cleanapplyreport=Continue
-### Missing: platform.extension.distributionWizard.extension.cleanStep.button.back=Back
-### Missing: platform.extension.distributionWizard.extension.cleanStep.apply.title=Apply
-### Missing: platform.extension.distributionWizard.extension.cleanStep.report.uninstalled=The following extensions have been uninstalled:
-### Missing: platform.extension.distributionWizard.extension.cleanStep.report.top=The following extensions have been made top level:
-### Missing: platform.extension.distributionWizard.extension.cleanStep.uninstall.finish.error=Failed to uninstall orphaned extensions
-### Missing: platform.extension.distributionWizard.extension.cleanStep.uninstall.finish.warning=The orphaned extensions have been successfully uninstalled but unexpected errors where logged during the process
-### Missing: platform.extension.distributionWizard.extension.cleanStep.uninstall.finish.success=The orphaned extensions have been successfully uninstalled
+platform.extension.distributionWizard.extension.cleanStepTitle=Depend\u00EAncias \u00F3rf\u00E3s
+platform.extension.distributionWizard.extension.cleanStepSummary=Certifique-se de que as depend\u00EAncias de extens\u00E3o \u00F3rf\u00E3s sejam removidas ou tornem-se de n\u00EDvel superior.
+platform.extension.distributionWizard.extension.cleanStep.noOrphaned=Nenhuma depend\u00EAncia \u00F3rf\u00E3 foi encontrada nessa inst\u00E2ncia.
+platform.extension.distributionWizard.extension.cleanStep.orphaned=As extens\u00F5es a seguir foram instaladas como depend\u00EAncias e n\u00E3o s\u00E3o mais necess\u00E1rias. Voc\u00EA pode desinstal\u00E1-los (marcado) ou torn\u00E1-los extens\u00F5es de n\u00EDvel superior se ainda precisar deles (desmarcado).
+platform.extension.distributionWizard.extension.cleanStep.button.cleanapply=Continuar
+platform.extension.distributionWizard.extension.cleanStep.button.cleanapplyfinalize=Continuar
+platform.extension.distributionWizard.extension.cleanStep.button.cleanapplyreport=Continuar
+platform.extension.distributionWizard.extension.cleanStep.button.back=Voltar
+platform.extension.distributionWizard.extension.cleanStep.apply.title=Aplicar
+platform.extension.distributionWizard.extension.cleanStep.report.uninstalled=As seguintes extens\u00F5es foram desinstaladas:
+platform.extension.distributionWizard.extension.cleanStep.report.top=As seguintes extens\u00F5es foram feitas em n\u00EDvel superior:
+platform.extension.distributionWizard.extension.cleanStep.uninstall.finish.error=Falha ao desinstalar extens\u00F5es \u00F3rf\u00E3s
+platform.extension.distributionWizard.extension.cleanStep.uninstall.finish.warning=As extens\u00F5es \u00F3rf\u00E3s foram desinstaladas com sucesso, mas erros inesperados foram registrados durante o processo
+platform.extension.distributionWizard.extension.cleanStep.uninstall.finish.success=As extens\u00F5es \u00F3rf\u00E3s foram desinstaladas com sucesso
 
 ### Logging Application Resources
-admin.logging=Logging
+admin.logging=Registro
 admin.logging.description=Revise e modifique o n\u00EDvel de log associado a um criador de logs registrado.
 logging.admin.intro=Aqui voc\u00EA pode modificar o n\u00EDvel de log associado a um logger registrado. <padr\u00E3o> ou vazio significa que o logger herda do seu logger pai o qual \u00E9 prefixo do pacote, se existir um, ou o n\u00EDvel padr\u00E3o na configura\u00E7\u00E3o do logger implementado se n\u00E3o houver pai.
 logging.admin.livetable.actions.set=Configurar
-logging.admin.livetable.logger=Logger
+logging.admin.livetable.logger=Registrador
 logging.admin.livetable.level=N\u00EDvel
 logging.admin.livetable.actions=A\u00E7\u00F5es
 
@@ -3902,21 +3902,21 @@ web.widgets.select.listbox.label=Op\u00E7\u00F5es para {0}
 web.widgets.select.listbox.description=Voc\u00EA pode navegar pelas op\u00E7\u00F5es usando as teclas de seta, as teclas inicial e final. Selecione a op\u00E7\u00E3o atualmente destacada pressionando enter ou espa\u00E7o. As setas para a direita e para a esquerda mover\u00E3o o foco para a pr\u00F3xima op\u00E7\u00E3o poss\u00EDvel na lista. A tecla Home trar\u00E1 o foco para o in\u00EDcio da lista e a tecla END para o final. As setas para cima e para baixo permitem navegar rapidamente at\u00E9 o in\u00EDcio das categorias de op\u00E7\u00F5es.
 
 ## Syntax Picker
-### Missing: web.widgets.syntaxPicker.configureSyntaxes=Configure more syntaxes
-### Missing: web.widgets.syntaxPicker.conversionConfirmation.title=Syntax Conversion
-### Missing: web.widgets.syntaxPicker.conversionConfirmation.message=Do you want to also convert the page content and meta data from the previous {0} syntax to the selected {1} syntax? Choosing ''No'' will only change the syntax identifier, without modifying the page content.
-### Missing: web.widgets.syntaxPicker.conversion.inProgress=Converting syntax...
-### Missing: web.widgets.syntaxPicker.conversion.done=Syntax converted
-### Missing: web.widgets.syntaxPicker.conversion.failed=Syntax conversion failed
-### Missing: web.widgets.syntaxPicker.contentUpdate.inProgress=Updating content...
-### Missing: web.widgets.syntaxPicker.contentUpdate.done=Content updated
-### Missing: web.widgets.syntaxPicker.contentUpdate.failed=Content update failed
-### Missing: web.widgets.syntaxPicker.conversionUnsupported.message=The automatic conversion from {0} to {1} syntax is not yet supported. This will change the syntax identifier but you''ll have to do the syntax conversion yourself.
+web.widgets.syntaxPicker.configureSyntaxes=Configurar mais sintaxes
+web.widgets.syntaxPicker.conversionConfirmation.title=Convers\u00E3o de Sintaxe
+web.widgets.syntaxPicker.conversionConfirmation.message=Voc\u00EA tamb\u00E9m deseja converter o conte\u00FAdo da p\u00E1gina e os metadados da sintaxe {0} anterior para a sintaxe {1} selecionada? Escolher ''N\u00E3o'' apenas alterar\u00E1 o identificador de sintaxe, sem modificar o conte\u00FAdo da p\u00E1gina.
+web.widgets.syntaxPicker.conversion.inProgress=Convertendo sintaxe...
+web.widgets.syntaxPicker.conversion.done=Sintaxe convertida
+web.widgets.syntaxPicker.conversion.failed=Falha na convers\u00E3o de sintaxe
+web.widgets.syntaxPicker.contentUpdate.inProgress=Atualizando conte\u00FAdo...
+web.widgets.syntaxPicker.contentUpdate.done=Conte\u00FAdo atualizado
+web.widgets.syntaxPicker.contentUpdate.failed=Falha na atualiza\u00E7\u00E3o de conte\u00FAdo
+web.widgets.syntaxPicker.conversionUnsupported.message=A convers\u00E3o autom\u00E1tica da sintaxe {0} para {1} ainda n\u00E3o \u00E9 suportada. Isso alterar\u00E1 o identificador de sintaxe, mas voc\u00EA mesmo ter\u00E1 que fazer a convers\u00E3o de sintaxe.
 ### Missing: web.widgets.syntaxPicker.conversionUnsupported.acknowledge=OK
 
 ## Editable Property (in-place editing of properties)
-### Missing: web.editableProperty.editFailed=Failed to edit property.
-### Missing: web.editableProperty.viewFailed=Failed to view property.
+web.editableProperty.editFailed=Falha ao editar a propriedade.
+web.editableProperty.viewFailed=Falha ao visualizar a propriedade.
 
 ## Drawer
 core.drawer.global=Global
@@ -3956,27 +3956,27 @@ XWiki.GoogleAnalyticsCode_method_universal=An\u00E1lise universal
 XWiki.GoogleAnalyticsCode_method_classic=An\u00E1lise Cl\u00E1ssica
 XWiki.GoogleAnalyticsCode_account=Conta
 ### Missing: platform.extension.distributionWizard.eventmigrationStepTitle=Events migration
-### Missing: platform.extension.distributionWizard.eventmigrationStepSummary=Copy events from the legacy event store to the new one
+platform.extension.distributionWizard.eventmigrationStepSummary=Copiar eventos do armazenamento de eventos legado para o novo
 platform.extension.distributionWizard.eventmigrationStepDescription=XWiki mudou para uma nova loja para eventos (notifica\u00E7\u00F5es) em 12.6. Como copiar eventos pode ser um processo longo para wikis antigos com muitos eventos e mant\u00EA-los nem sempre \u00E9 desejado, a escolha de faz\u00EA-lo \u00E9 deixada ao administrador do wiki. N\u00E3o copi\u00E1-los implica que qualquer notifica\u00E7\u00E3o anterior parecer\u00E1 ter desaparecido. A migra\u00E7\u00E3o \u00E9 executada em segundo plano e voc\u00EA n\u00E3o precisa esperar que ela termine antes de passar para a pr\u00F3xima etapa.
-### Missing: platform.extension.distributionWizard.eventmigration.alltime=All time
-### Missing: platform.extension.distributionWizard.eventmigration.since=Since
+platform.extension.distributionWizard.eventmigration.alltime=Tempo todo
+platform.extension.distributionWizard.eventmigration.since=Desde
 ### Missing: platform.extension.distributionWizard.eventmigration.startMigration=Start migration
 
 #@deprecated extensions.search.all.label
 extensions.search.repository.all.label=Todas as extens\u00F5es
 #@deprecated extensions.search.recommended.label
-### Missing: extensions.search.repository.recommended.label=Recommended Extensions
+extensions.search.repository.recommended.label=Extens\u00F5es recomendadas
 #@deprecated extensions.search.recommended.disclaimer
-### Missing: extensions.search.repository.recommended.disclaimer=This only includes recommended extensions.
+extensions.search.repository.recommended.disclaimer=Isso inclui apenas extens\u00F5es recomendadas.
 #@deprecated extensions.search.recommended.fallback
-### Missing: extensions.search.repository.recommended.fallback=No recommended extension could be found matching ''{0}'', displaying results of the search in {1}.
+extensions.search.repository.recommended.fallback=Nenhuma extens\u00E3o recomendada foi encontrada correspondente a ''{0}'', exibindo resultados da pesquisa em {1}.
 
 #######################################
 ## until 10.1
 #######################################
 
-### Missing: job.log.label.refactoring/rename=Rename log
-### Missing: job.log.label.refactoring/copyAs=Copy log
+job.log.label.refactoring/rename=Renomear registro
+job.log.label.refactoring/copyAs=Copiar registro
 
 #######################################
 ## until 2.3
@@ -4735,16 +4735,16 @@ xe.userdirectory.doc.fullName=ID de usu\u00E1rio
 #######################################
 ## until 6.2M1
 #######################################
-### Missing: extensions.info.jobLog=Job log
+extensions.info.jobLog=Registro de trabalho
 
 #@deprecated job.log.label.install
 ### Missing: extensions.info.jobLog.install=Install log
 #@deprecated job.log.label.installplan
 ### Missing: extensions.info.jobLog.installplan=Install plan log
 #@deprecated job.log.label.uninstall
-### Missing: extensions.info.jobLog.uninstall=Uninstall log
+extensions.info.jobLog.uninstall=Registro de desinstala\u00E7\u00E3o
 #@deprecated job.log.label.uninstallplan
-### Missing: extensions.info.jobLog.uninstallplan=Uninstall plan log
+extensions.info.jobLog.uninstallplan=Desinstalar registro do plano
 
 #######################################
 ## until 6.3
@@ -4826,9 +4826,9 @@ xe.spaces.deleteSpace.deleted=Espa\u00E7o \u00AB{0}\u00BB removido.
 ### RSS
 xe.rss.pages.modified=RSS de P\u00E1ginas Modificadas
 xe.rss.feed.description=Recebimento de RSS para mudan\u00E7as em documento
-### Missing: xe.rss.feed.tags.description=RSS feed for documents tagged with "{0}"
-### Missing: xe.rss.feed.spaces.description=RSS feed for documents in space(s) "{0}"
-### Missing: xe.rss.feed.tagsAndSpaces.description=RSS feed for documents tagged with "{0}" in space(s) "{1}"
+xe.rss.feed.tags.description=Feed RSS para documentos marcados com "{0}"
+xe.rss.feed.spaces.description=Feed RSS para documentos em espa\u00E7o(s) "{0}"
+xe.rss.feed.tagsAndSpaces.description=Feed RSS para documentos marcados com "{0}" no(s) espa\u00E7o(s) "{1}"
 
 ### History
 core.viewers.diff.tag.tags=Marcadores
@@ -4927,7 +4927,7 @@ platform.appwithinminutes.appHomePageTitle={0} P\u00E1gina Incial
 
 ### History
 ### Missing: web.history.changes.attachment.author=Author
-### Missing: web.history.changes.lineEndings=Only the line endings have changed
+web.history.changes.lineEndings=Apenas os finais das linhas mudaram
 
 #@deprecated web.history.changes.document.title
 core.viewers.diff.metadata.title=T\u00EDtulo
@@ -5041,7 +5041,7 @@ core.copy.copyingdoc=P\u00E1gina {0} copiada com sucesso para {1}
 ## until 7.4.3 / 8.0RC1
 #######################################
 
-### Missing: core.rename.children.labelWithoutParams=Affect the child pages
+core.rename.children.labelWithoutParams=Afetar as p\u00E1ginas filhas
 ### Missing: core.rename.links.labelWithoutParams=Update the wiki links
 
 #######################################
@@ -5089,11 +5089,11 @@ xe.xwiki.space=Espa\u00E7o XWiki
 #######################################
 
 #@deprecated platform.web.init.message.initializing
-### Missing: platform.web.init.message.intializing=XWiki is initializing ({0}%)...
+platform.web.init.message.intializing=XWiki est\u00E1 inicializando ({0}%)....
 #@deprecated platform.web.init.message.initializationFailure
-### Missing: platform.web.init.message.intializationFailure=XWiki initialization failed!
+platform.web.init.message.intializationFailure=A inicializa\u00E7\u00E3o do XWiki falhou!
 #@deprecated platform.web.init.message.initializationSuccess
-### Missing: platform.web.init.message.intializationSuccess=XWiki is initialized, you will be redirected shortly
+platform.web.init.message.intializationSuccess=XWiki foi inicializado, voc\u00EA ser\u00E1 redirecionado em breve
 
 #######################################
 ## until 9.1.2
@@ -5172,8 +5172,8 @@ xe.blog.code.madevisible=A entrada ficou vis\u00EDvel.
 xe.blog.code.hid=Post%20escondido
 xe.blog.code.makevisible=Este blog n\u00E3o \u00E9 vis\u00EDvel para os outros usu\u00E1rios. Torne-o vis\u00EDvel.
 xe.blog.code.hide=Esconda esse post do blog para os outros usu\u00E1rios.
-### Missing: xe.blog.code.loading=Loading...
-### Missing: xe.blog.code.failedToChangeBlogPostVisibility=Failed to change blog post visibility.
+xe.blog.code.loading=Carregando...
+xe.blog.code.failedToChangeBlogPostVisibility=Falha ao alterar a visibilidade da postagem do blog.
 xe.blog.code.editpost=Editar este post do Blog
 xe.blog.code.deletepost=Remover esse post de blog
 xe.blog.code.readpost=Ler o post completo
@@ -5190,12 +5190,12 @@ xe.blog.code.previousmonth=M\u00EAs anterior
 xe.blog.code.nextmonth=Pr\u00F3ximo m\u00EAs
 xe.blog.code.olderposts=Posts mais antigos
 xe.blog.code.newerposts=Posts recentes
-### Missing: xe.blog.code.blogcategories=Blog categories
-### Missing: xe.blog.code.description.category=Most recent blog posts in the {0} category
-### Missing: xe.blog.code.description.space=Most recent blog posts in the {0} space
+xe.blog.code.blogcategories=Categorias de blogs
+xe.blog.code.description.category=Postagens de blog mais recentes na categoria {0}
+xe.blog.code.description.space=Postagens de blog mais recentes no espa\u00E7o {0}
 ### Missing: xe.blog.code.description.wiki=Most recent blog posts in the wiki
 ### Missing: xe.blog.code.title=Blog
-### Missing: xe.blog.code.warning=Warning:
+xe.blog.code.warning=Aviso:
 xe.blog.sheet.notpost=Esta n\u00E3o \u00E9 uma entrada de blog\!
 xe.blog.sheet.category=Categoria\:
 xe.blog.sheet.summary=Resumo (opcional)\:
@@ -5225,15 +5225,15 @@ xe.blog.categories.articles=Artigos dessa categoria
 xe.blog.categories.sheet=Folha de categoria
 xe.blog.categories.sheetmessage=Essa folha deve ser usada para exibir categorias de blog.
 xe.blog.categories.notcategory=Essa n\u00E3o \u00E9 uma categoria de blog\!
-### Missing: xe.blog.categories.noentries=No entries in this category
+xe.blog.categories.noentries=Nenhuma entrada nesta categoria
 xe.blog.manageCategories.title=Gerenciar categorias de blog
 xe.blog.manageCategories.create.error.emptyName=Por favor entre um nome de categoria v\u00E1lido
 xe.blog.manageCategories.create.error.alreadyExists=Documento j\u00E1 existe, por favor informe um nome diferente
-### Missing: xe.blog.manageCategories.create.error.notExists=The requested page could not be found.
-### Missing: xe.blog.manageCategories.create.error.targetNotWritable=You don't have the right to create the target page.
+xe.blog.manageCategories.create.error.notExists=A p\u00E1gina solicitada n\u00E3o p\u00F4de ser encontrada.
+xe.blog.manageCategories.create.error.targetNotWritable=Voc\u00EA n\u00E3o tem o direito de criar a p\u00E1gina de destino.
 xe.blog.manageCategories.rename.error.emptyName=Por favor, entre um nome da categoria v\u00E1lido
 xe.blog.manageCategories.js.fetchingForm=Buscando formul\u00E1rio...
-### Missing: xe.blog.manageCategories.js.error.noServer=Server not responding
+xe.blog.manageCategories.js.error.noServer=Servidor n\u00E3o responde
 xe.blog.manageCategories.js.rename.inProgress=Renomeado categoria...
 xe.blog.manageCategories.js.rename.error.403=Voc\u00EA n\u00E3o tem permiss\u00E3o para criar o documento
 xe.blog.manageCategories.js.rename.error.404=Categoria inv\u00E1lida. Por favor, atualize a p\u00E1gina para atualizar a \u00E1rvore de categorias
@@ -5289,8 +5289,8 @@ core.menu.moreactions=Mais a\u00E7\u00F5es
 #######################################
 ## until 9.5-rc-1
 #######################################
-### Missing: core.delete.confirm.yes=Yes, please delete this page
-### Missing: core.delete.confirm.no=No, take me back!
+core.delete.confirm.yes=Sim, exclua esta p\u00E1gina
+core.delete.confirm.no=N\u00E3o, me leve de volta!
 
 #######################################
 ## until 9.7-rc-1
@@ -5360,7 +5360,7 @@ xe.admin.users.filter.lastname=Filtro por \u00FAltimo nome
 #######################################
 ## until 11.1-rc-1
 #######################################
-### Missing: platform.search.suggestSourceDocumentName=Page names
+platform.search.suggestSourceDocumentName=Nomes de p\u00E1ginas
 
 #######################################
 ## until 11.1
@@ -5371,10 +5371,10 @@ core.editors.class.switchClass.warning=Mudan\u00E7as n\u00E3o salvas ser\u00E3o
 #######################################
 ## until 11.4-rc-1
 #######################################
-### Missing: core.editors.save.conflictversion.rollbackmessage=The document has been modified since you last saved it. Please copy your changes and reload the page to get the latest version and reapply your changes.
-### Missing: core.editors.save.conflictversion.previousVersion=Your version of the document:
-### Missing: core.editors.save.conflictversion.latestVersion=Latest version of the document:
-### Missing: core.editors.save.conflictversion.diffLink=Click here to check out the changes made on the latest version since you started editing it.
+core.editors.save.conflictversion.rollbackmessage=O documento foi modificado desde a \u00FAltima vez que voc\u00EA o salvou. Copie suas altera\u00E7\u00F5es e recarregue a p\u00E1gina para obter a vers\u00E3o mais recente e reaplicar suas altera\u00E7\u00F5es.
+core.editors.save.conflictversion.previousVersion=Sua vers\u00E3o do documento:
+core.editors.save.conflictversion.latestVersion=Vers\u00E3o mais recente do documento:
+core.editors.save.conflictversion.diffLink=Clique aqui para conferir as altera\u00E7\u00F5es feitas na vers\u00E3o mais recente desde que voc\u00EA come\u00E7ou a edit\u00E1-la.
 
 #######################################
 ## until 11.6-rc-1
@@ -5417,7 +5417,7 @@ core.editors.object.delete.confirm=Voc\u00EA tem certeza que deseja remover esse
 #######################################
 ## until 12.10, 12.6.5, 11.10.12
 #######################################
-### Missing: core.viewers.jump.dialog.invalidNameError=Invalid page name. Valid names have the following format: Space.Page
+core.viewers.jump.dialog.invalidNameError=Nome de p\u00E1gina inv\u00E1lido. Os nomes v\u00E1lidos t\u00EAm o seguinte formato: Space.Page
 core.viewers.jump.suggest.noResults=Nenhum documento encontrado
 core.widgets.suggestPicker.deleteAll=Limpar sele\u00E7\u00E3o
 core.widgets.suggestPicker.deleteAll.tooltip=Limpar a lista de itens selecionados
@@ -5482,7 +5482,7 @@ platform.index.spaceIndexDocumentListCreate=Criar uma nova p\u00E1gina
 
 ## Used to indicate where keys that does not need to be translated starts
 ## l10n wiki used that to not import them for example
-notranslationsmarker=notranslationsmarker
+notranslationsmarker=sem marcador de tradu\u00E7\u00F5es
 ### Missing: hrtext=
 ### Missing: signtext=
 ### Missing: core.edit.wikiToolbar.signtext=
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_ru.properties b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_ru.properties
index 3c4632e5f1f701eeb9f3ca76bb3ee43c26f3b9ff..1d68c181338abdda56569ca59678d97ef0a20cd1 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_ru.properties
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_ru.properties
@@ -677,10 +677,10 @@ platform.core.profile.phone=\u0422\u0435\u043B\u0435\u0444\u043E\u043D
 platform.core.profile.address=\u0410\u0434\u0440\u0435\u0441
 platform.core.profile.editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E
 platform.core.profile.userType=\u0422\u0438\u043F \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F
-platform.core.profile.enableAccessibility=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0444\u0443\u043D\u043A\u0446\u0438\u0438
 platform.core.profile.displayHiddenDocuments=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u0441\u043A\u0440\u044B\u0442\u044B\u0435 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u044B
 platform.core.profile.timezone=\u0412\u0440\u0435\u043C\u0435\u043D\u043D\u0430\u044F \u0437\u043E\u043D\u0430
 platform.core.profile.extensionConflictSetup=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0443 \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u0430 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u0439
+platform.core.profile.accessibility.underline=\u041F\u043E\u0434\u0447\u0435\u0440\u043A\u0438\u0432\u0430\u043D\u0438\u0435 \u0441\u0441\u044B\u043B\u043E\u043A
 platform.core.profile.category.settings=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
 platform.core.profile.category.profile=\u041F\u0440\u043E\u0444\u0438\u043B\u044C
 platform.core.profile.category.profile.edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u0440\u043E\u0444\u0438\u043B\u044C
@@ -701,7 +701,8 @@ platform.core.profile.section.sendMessage=\u041E\u0442\u043F\u0440\u0430\u0432\u
 platform.core.profile.section.activity=\u041C\u043E\u044F \u043B\u0435\u043D\u0442\u0430 \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442\u0438
 platform.core.profile.section.activityof=\u041B\u0435\u043D\u0442\u0430 \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442\u0438 {0}
 platform.core.profile.section.displayPreferences=\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
-platform.core.profile.section.localizationPreferences=\u041D\u0430\u0441\u0442\u043E\u0439\u043A\u0438 \u043B\u043E\u043A\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u0438
+platform.core.profile.section.accessibilityPreferences=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u043E\u0441\u0442\u0438
+platform.core.profile.section.localizationPreferences=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043B\u043E\u043A\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u0438
 platform.core.profile.section.editorPreferences=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043A
 platform.core.profile.section.extensionPreferences=\u0421\u0432\u043E\u0439\u0441\u0442\u0432\u0430 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F
 platform.core.profile.section.datePreferences=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u0430\u0442\u044B
@@ -1062,6 +1063,7 @@ core.viewers.attachments.delete.done=\u0424\u0430\u0439\u043B \u0443\u0434\u0430
 core.viewers.attachments.delete.failed=\u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438 \u0443\u0434\u0430\u043B\u0435\u043D\u0438\u0438 \u0444\u0430\u0439\u043B\u0430:
 core.viewers.attachments.livetable.actions=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044F
 core.viewers.attachments.livetable.author=\u0410\u0432\u0442\u043E\u0440
+core.viewers.attachments.livetable.comment=\u0421\u0432\u043E\u0434\u043A\u0430
 core.viewers.attachments.livetable.date=\u0414\u0430\u0442\u0430
 core.viewers.attachments.livetable.filename=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435
 core.viewers.attachments.livetable.filesize=\u0420\u0430\u0437\u043C\u0435\u0440 \u0444\u0430\u0439\u043B\u0430
@@ -1077,6 +1079,8 @@ core.viewers.attachments.showHistory=\u041F\u0440\u043E\u0441\u043C\u043E\u0442\
 core.viewers.attachments.author=\u041E\u043F\u0443\u0431\u043B\u0438\u043A\u043E\u0432\u0430\u043B {0}
 core.viewers.attachments.date={0}
 core.viewers.attachments.noAttachments=\u0423 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430 \u043D\u0435\u0442 \u0444\u0430\u0439\u043B\u043E\u0432
+core.viewers.attachments.upload.comment=\u0421\u0432\u043E\u0434\u043A\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438
+core.viewers.attachments.upload.comment.hint=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 \u044D\u0442\u043E\u0439 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 (\u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0435\u0442\u0441\u044F \u0432 \u0438\u0441\u0442\u043E\u0440\u0438\u0438 \u0432\u043B\u043E\u0436\u0435\u043D\u0438\u0439)
 core.viewers.attachments.upload.title=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0444\u0430\u0439\u043B\u044B \u043A \u044D\u0442\u043E\u043C\u0443 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0443
 core.viewers.attachments.upload.filename=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0446\u0435\u043B\u0435\u0432\u043E\u0435 \u0438\u043C\u044F \u0444\u0430\u0439\u043B\u0430:
 core.viewers.attachments.upload.file=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043B \u0434\u043B\u044F \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438:
@@ -2741,11 +2745,9 @@ xe.panels.rights.authenticate=\u0414\u043B\u044F \u043F\u0440\u043E\u0441\u043C\
 xe.panels.rights.banned=\u0417\u0430\u043F\u0440\u0435\u0449\u0435\u043D\u043D\u044B\u0435 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0438
 xe.panels.tagcloud.title=\u041E\u0431\u043B\u0430\u043A\u043E \u0442\u0435\u0433\u043E\u0432
 xe.panels.shortcuts=\u0411\u044B\u0441\u0442\u0440\u044B\u0439 \u0432\u044B\u0437\u043E\u0432
-xe.panels.spaces=\u0420\u0430\u0437\u0434\u0435\u043B\u044B
 xe.panels.syntax.help=\u0421\u043F\u0440\u0430\u0432\u043A\u0430 \u043F\u043E \u0441\u0438\u043D\u0442\u0430\u043A\u0441\u0438\u0441\u0443 XWiki
 xe.panels=\u041F\u0430\u043D\u0435\u043B\u0438
 xe.panels.create=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043D\u043E\u0432\u0443\u044E \u043F\u0430\u043D\u0435\u043B\u044C
-xe.panels.customize=\u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u043D\u0430\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0442\u044C \u0431\u043E\u043A\u043E\u0432\u044B\u0435 \u043A\u043E\u043B\u043E\u043D\u043A\u0438 \u043C\u0435\u043D\u044E \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u044F
 xe.panels.welcome.xwiki=\u0414\u043E\u0431\u0440\u043E \u043F\u043E\u0436\u0430\u043B\u043E\u0432\u0430\u0442\u044C \u0432 XWiki!
 
 ### Scheduler application
@@ -2914,11 +2916,6 @@ platform.index.trashAttachmentsDeleteInProgress=\u0423\u0434\u0430\u043B\u0435\u
 platform.index.trashAttachmentsDeleteDone=\u0412\u043B\u043E\u0436\u0435\u043D\u0438\u0435 \u0443\u0434\u0430\u043B\u0435\u043D\u043E \u043D\u0430\u0432\u0441\u0435\u0433\u0434\u0430
 platform.index.trashAttachmentsDeleteFailed=\u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438 \u0443\u0434\u0430\u043B\u0435\u043D\u0438\u0438:
 
-### Space Index Page
-platform.index.spaceIndex=\u0418\u043D\u0434\u0435\u043A\u0441 \u0440\u0430\u0437\u0434\u0435\u043B\u0430
-platform.index.spaceIndexDescription=\u0421\u0442\u0440\u0430\u043D\u0438\u0446\u044B \u0432 \u0440\u0430\u0437\u0434\u0435\u043B\u0435 {0}:
-platform.index.spaceIndexDocumentListCreate=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043D\u043E\u0432\u0443\u044E \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
-
 ####################
 # Livetable Module
 ####################
@@ -3343,6 +3340,10 @@ XWiki.XWikiUsers_usertype_Advanced=\u041F\u0440\u043E\u0434\u0432\u0438\u043D\u0
 XWiki.XWikiUsers_phone=\u0422\u0435\u043B\u0435\u0444\u043E\u043D
 XWiki.XWikiUsers_address=\u0410\u0434\u0440\u0435\u0441
 XWiki.XWikiUsers_extensionConflictSetup=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0443 \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u0430 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u0439
+XWiki.XWikiUsers_underline=\u041F\u043E\u0434\u0447\u0435\u0440\u043A\u0438\u0432\u0430\u043D\u0438\u0435 \u0441\u0441\u044B\u043B\u043E\u043A
+XWiki.XWikiUsers_underline_Yes=\u0414\u0430
+XWiki.XWikiUsers_underline_OnlyInlineLinks=\u0422\u043E\u043B\u044C\u043A\u043E \u0432\u043D\u0443\u0442\u0440\u0438\u0441\u0442\u0440\u043E\u0447\u043D\u044B\u0435 \u0441\u0441\u044B\u043B\u043A\u0438
+XWiki.XWikiUsers_underline_No=\u041D\u0435\u0442
 
 ### XWiki.XWikiSkins (core)
 XWiki.XWikiSkins_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435
@@ -3929,6 +3930,7 @@ template.error.requirement.action=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u04
 
 security.authservice.service.standard.name=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439 XWiki-\u0430\u0443\u0442\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440
 security.authservice.service.standard.description=\u0410\u0443\u0442\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440 \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E, \u043E\u0441\u043D\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u043D\u0430 \u043F\u0430\u0440\u043E\u043B\u044F\u0445, \u0445\u0440\u0430\u043D\u044F\u0449\u0438\u0445\u0441\u044F \u0432 \u043F\u0440\u043E\u0444\u0438\u043B\u044F\u0445 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439
+xe.panels.customize=\u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u043D\u0430\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0442\u044C \u0431\u043E\u043A\u043E\u0432\u044B\u0435 \u043A\u043E\u043B\u043E\u043D\u043A\u0438 \u043C\u0435\u043D\u044E \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u044F
 admin.analytics=Google Analytics\u2122
 admin.analytics.description=\u041D\u0430\u0441\u0442\u0440\u043E\u0438\u0442\u044C \u0443\u0447\u0435\u0442\u043D\u0443\u044E \u0437\u0430\u043F\u0438\u0441\u044C Google Analytics\u2122.
 admin.analytics.account.description=\u0414\u043B\u044F \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u043E\u0442\u0441\u043B\u0435\u0436\u0438\u0432\u0430\u043D\u0438\u0435 \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u043E\u0432 \u0441\u0442\u0440\u0430\u043D\u0438\u0446 \u0432 Google Analytics \u2122, \u0443\u043A\u0430\u0436\u0438\u0442\u0435 \u0441\u0432\u043E\u0439 \u0430\u043A\u043A\u0430\u0443\u043D\u0442 Google Analytics \u2122. \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0432\u0432\u0435\u0441\u0442\u0438 \u0431\u043E\u043B\u044C\u0448\u0435 \u0443\u0447\u0435\u0442\u043D\u044B\u0445 \u0437\u0430\u043F\u0438\u0441\u0435\u0439 (\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u043D\u044B\u0445 \u043F\u0440\u043E\u0431\u0435\u043B\u0430\u043C\u0438), \u0447\u0442\u043E\u0431\u044B \u043E\u0442\u0441\u043B\u0435\u0436\u0438\u0432\u0430\u0442\u044C \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B \u0432 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u0438\u0445 \u0443\u0447\u0435\u0442\u043D\u044B\u0445 \u0437\u0430\u043F\u0438\u0441\u044F\u0445.
@@ -5451,6 +5453,13 @@ core.viewers.diff.previousVersion=\u041F\u0440\u0435\u0434\u044B\u0434\u0443\u04
 core.viewers.diff.nextChange=\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0435\u0435 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0435
 core.viewers.diff.previousChange=\u041F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0435\u0435 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0435
 xe.admin.passwordReset.step2.error.wrongParameters=\u041D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B! \u0423\u0436\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0434\u0440\u0443\u0433\u0430\u044F \u0441\u0441\u044B\u043B\u043A\u0430, \u043B\u0438\u0431\u043E \u0434\u043E\u0441\u0442\u0443\u043F \u043F\u043E \u0434\u0430\u043D\u043D\u043E\u0439 \u0441\u0441\u044B\u043B\u043A\u0435 \u0443\u0436\u0435 \u0431\u044B\u043B \u043E\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u043B\u0451\u043D!
+platform.core.profile.enableAccessibility=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0444\u0443\u043D\u043A\u0446\u0438\u0438
+xe.panels.spaces=\u0420\u0430\u0437\u0434\u0435\u043B\u044B
+
+### Space Index Page
+platform.index.spaceIndex=\u0418\u043D\u0434\u0435\u043A\u0441 \u0440\u0430\u0437\u0434\u0435\u043B\u0430
+platform.index.spaceIndexDescription=\u0421\u0442\u0440\u0430\u043D\u0438\u0446\u044B \u0432 \u0440\u0430\u0437\u0434\u0435\u043B\u0435 {0}:
+platform.index.spaceIndexDocumentListCreate=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043D\u043E\u0432\u0443\u044E \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443
 
 ## Used to indicate where deprecated keys end
 #@deprecatedend
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_uk.properties b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_uk.properties
index 5e3972f3b16fba595c0b8e2abffc2c2d92e85484..4a549fc147d1feddb1780eee7e5033de05c6d93c 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_uk.properties
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources_uk.properties
@@ -677,10 +677,10 @@ platform.core.profile.phone=\u0422\u0435\u043B\u0435\u0444\u043E\u043D
 platform.core.profile.address=\u0410\u0434\u0440\u0435\u0441\u0430
 platform.core.profile.editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0437\u0430 \u0443\u043C\u043E\u0432\u0447\u0430\u043D\u043D\u044F\u043C
 platform.core.profile.userType=\u0422\u0438\u043F \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430
-platform.core.profile.enableAccessibility=\u0423\u0432\u0456\u043C\u043A\u043D\u0443\u0442\u0438 \u043C\u043E\u0436\u043B\u0438\u0432\u043E\u0441\u0442\u0456 \u0435\u043A\u0441\u0442\u0440\u0430\u0434\u043E\u0441\u0442\u0443\u043F\u0443
 platform.core.profile.displayHiddenDocuments=\u041F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043F\u0440\u0438\u0445\u043E\u0432\u0430\u043D\u0456 \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u0438
 platform.core.profile.timezone=\u0427\u0430\u0441\u043E\u0432\u0438\u0439 \u043F\u043E\u044F\u0441
 platform.core.profile.extensionConflictSetup=\u0423\u0432\u0456\u043C\u043A\u043D\u0443\u0442\u0438 \u043D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u043A\u043E\u043D\u0444\u043B\u0456\u043A\u0442\u0443 \u0440\u043E\u0437\u0448\u0438\u0440\u0435\u043D\u043D\u044F
+platform.core.profile.accessibility.underline=\u041F\u0456\u0434\u043A\u0440\u0435\u0441\u043B\u0435\u043D\u0456 \u043F\u043E\u0441\u0438\u043B\u0430\u043D\u043D\u044F
 platform.core.profile.category.settings=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F
 platform.core.profile.category.profile=\u041F\u0440\u043E\u0444\u0456\u043B\u044C
 platform.core.profile.category.profile.edit=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043F\u0440\u043E\u0444\u0456\u043B\u044E
@@ -701,6 +701,7 @@ platform.core.profile.section.sendMessage=\u041D\u0430\u0434\u0456\u0441\u043B\u
 platform.core.profile.section.activity=\u041C\u0456\u0439 \u043F\u043E\u0442\u0456\u043A \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442\u0456
 platform.core.profile.section.activityof=\u041F\u043E\u0442\u0456\u043A \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0441\u0442\u0456 {0}
 platform.core.profile.section.displayPreferences=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u0432\u0456\u0434\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u043D\u044F
+platform.core.profile.section.accessibilityPreferences=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u0441\u043F\u0435\u0446\u0456\u0430\u043B\u044C\u043D\u0438\u0445 \u043C\u043E\u0436\u043B\u0438\u0432\u043E\u0441\u0442\u0435\u0439
 platform.core.profile.section.localizationPreferences=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u043B\u043E\u043A\u0430\u043B\u0456\u0437\u0430\u0446\u0456\u0457
 platform.core.profile.section.editorPreferences=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430
 platform.core.profile.section.extensionPreferences=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u0440\u043E\u0437\u0448\u0438\u0440\u0435\u043D\u044C
@@ -1062,6 +1063,7 @@ core.viewers.attachments.delete.done=\u0424\u0430\u0439\u043B \u0432\u0438\u0434
 core.viewers.attachments.delete.failed=\u041D\u0435 \u0432\u0434\u0430\u043B\u043E\u0441\u044F \u0432\u0438\u0434\u0430\u043B\u0438\u0442\u0438 \u0444\u0430\u0439\u043B:
 core.viewers.attachments.livetable.actions=\u0414\u0456\u0457
 core.viewers.attachments.livetable.author=\u0410\u0432\u0442\u043E\u0440
+core.viewers.attachments.livetable.comment=\u041F\u0456\u0434\u0441\u0443\u043C\u043E\u043A
 core.viewers.attachments.livetable.date=\u0414\u0430\u0442\u0430
 core.viewers.attachments.livetable.filename=\u041D\u0430\u0437\u0432\u0430 \u0444\u0430\u0439\u043B\u0443
 core.viewers.attachments.livetable.filesize=\u0420\u043E\u0437\u043C\u0456\u0440 \u0444\u0430\u0439\u043B\u0443
@@ -1077,6 +1079,8 @@ core.viewers.attachments.showHistory=\u041F\u0435\u0440\u0435\u0433\u043B\u044F\
 core.viewers.attachments.author=\u0414\u043E\u0434\u0430\u0432(-\u043B\u0430) {0}
 core.viewers.attachments.date=\u0434\u0430\u0442\u0430 {0}
 core.viewers.attachments.noAttachments=\u0423 \u0446\u044C\u043E\u0433\u043E \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0443 \u043D\u0435\u043C\u0430\u0454 \u043F\u0440\u0438\u043A\u0440\u0456\u043F\u043B\u0435\u043D\u0438\u0445 \u0444\u0430\u0439\u043B\u0456\u0432
+core.viewers.attachments.upload.comment=\u0417\u0430\u0432\u0430\u043D\u0442\u0430\u0436\u0438\u0442\u0438 \u043F\u0456\u0434\u0441\u0443\u043C\u043E\u043A
+core.viewers.attachments.upload.comment.hint=\u041E\u043F\u0438\u0441 \u0446\u044C\u043E\u0433\u043E \u0437\u0430\u0432\u0430\u043D\u0442\u0430\u0436\u0435\u043D\u043D\u044F (\u043F\u043E\u043A\u0430\u0437\u0430\u043D\u043E \u0432 \u0456\u0441\u0442\u043E\u0440\u0456\u0457 \u0432\u043A\u043B\u0430\u0434\u0435\u043D\u044C)
 core.viewers.attachments.upload.title=\u041F\u0440\u0438\u043A\u0440\u0456\u043F\u0438\u0442\u0438 \u0444\u0430\u0439\u043B\u0438 \u0434\u043E \u0446\u044C\u043E\u0433\u043E \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0443
 core.viewers.attachments.upload.filename=\u041E\u0431\u0435\u0440\u0456\u0442\u044C \u043A\u0456\u043D\u0446\u0435\u0432\u0435 \u0456\u043C\u2019\u044F \u0444\u0430\u0439\u043B\u0443:
 core.viewers.attachments.upload.file=\u041E\u0431\u0435\u0440\u0456\u0442\u044C \u0444\u0430\u0439\u043B \u0434\u043B\u044F \u0437\u0430\u0432\u0430\u043D\u0442\u0430\u0436\u0435\u043D\u043D\u044F:
@@ -2439,7 +2443,6 @@ xe.admin.passwordReset.step2.login=\u0411\u0443\u0434\u044C \u043B\u0430\u0441\u
 xe.admin.passwordReset.step2.backToStep1=\u041F\u043E\u0432\u0435\u0440\u043D\u0443\u0442\u0438\u0441\u044F \u0434\u043E \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u0438 \u0441\u043A\u0438\u0434\u0430\u043D\u043D\u044F \u043F\u0430\u0440\u043E\u043B\u044F \u00BB
 xe.admin.passwordReset.step2.error.emptyPassword=\u041F\u0430\u0440\u043E\u043B\u044C \u043D\u0435 \u043C\u043E\u0436\u0435 \u0431\u0443\u0442\u0438 \u043F\u043E\u0440\u043E\u0436\u043D\u0456\u043C.
 xe.admin.passwordReset.step2.error.verificationMismatch=\u0426\u0456 \u0434\u0432\u0430 \u043F\u0430\u0440\u043E\u043B\u0456 \u043D\u0435 \u0437\u0431\u0456\u0433\u0430\u044E\u0442\u044C\u0441\u044F.
-xe.admin.passwordReset.step2.error.wrongParameters=\u041D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u0456 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438! \u0429\u0435 \u043E\u0434\u043D\u0435 \u043F\u043E\u0441\u0438\u043B\u0430\u043D\u043D\u044F \u0432\u0436\u0435 \u0431\u0443\u043B\u043E \u043D\u0430\u0434\u0456\u0441\u043B\u0430\u043D\u043E, \u0430\u0431\u043E \u0437\u0430 \u0446\u0438\u043C \u043F\u043E\u0441\u0438\u043B\u0430\u043D\u043D\u044F\u043C \u0432\u0436\u0435 \u0431\u0443\u0432 \u0432\u0438\u043A\u043E\u043D\u0430\u043D\u0438\u0439 \u043F\u0435\u0440\u0435\u0445\u0456\u0434!
 xe.admin.passwordReset.step2.error.noProgrammingRights=\u0426\u044F \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u0430 \u043F\u043E\u0442\u0440\u0435\u0431\u0443\u0454 \u043F\u0440\u0430\u0432 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0443\u0432\u0430\u043D\u043D\u044F \u043D\u0430 \u0440\u043E\u0431\u043E\u0442\u0443, \u044F\u043A\u0456 \u043D\u0430\u0440\u0430\u0437\u0456 \u0432\u0456\u0434\u0441\u0443\u0442\u043D\u0456. \u0411\u0443\u0434\u044C \u043B\u0430\u0441\u043A\u0430, \u043F\u043E\u0432\u0456\u0434\u043E\u043C\u0442\u0435 \u0430\u0434\u043C\u0456\u043D\u0456\u0441\u0442\u0440\u0430\u0442\u043E\u0440\u0430 \u043F\u0440\u043E \u0446\u044E \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0443 \u0456 \u0441\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0449\u0435 \u0440\u0430\u0437 \u043F\u0456\u0437\u043D\u0456\u0448\u0435.
 xe.admin.passwordReset.step2.versionComment.passwordReset=\u041F\u0430\u0440\u043E\u043B\u044C \u0431\u0443\u043B\u043E \u0441\u043A\u0438\u043D\u0443\u0442\u043E
 xe.admin.passwordReset.step2.versionComment.changeValidationKey=\u041E\u043D\u043E\u0432\u043B\u0435\u043D\u043E \u043A\u043B\u044E\u0447 \u0432\u0456\u0434\u043D\u043E\u0432\u043B\u0435\u043D\u043D\u044F \u043F\u0430\u0440\u043E\u043B\u044F
@@ -2742,11 +2745,9 @@ xe.panels.rights.authenticate=\u0410\u0432\u0442\u043E\u0440\u0438\u0437\u0443\u
 xe.panels.rights.banned=\u0417\u0430\u0431\u043B\u043E\u043A\u043E\u0432\u0430\u043D\u0456 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0456
 xe.panels.tagcloud.title=\u0425\u043C\u0430\u0440\u0430 \u0442\u0435\u0433\u0456\u0432
 xe.panels.shortcuts=\u0413\u0430\u0440\u044F\u0447\u0456 \u043A\u043B\u0430\u0432\u0456\u0448\u0456
-xe.panels.spaces=\u041F\u0440\u043E\u0441\u0442\u043E\u0440\u0438
 xe.panels.syntax.help=\u0414\u043E\u0432\u0456\u0434\u043A\u0430 \u0441\u0438\u043D\u0442\u0430\u043A\u0441\u0438\u0441\u0443 XWiki
 xe.panels=\u041F\u0430\u043D\u0435\u043B\u0456
 xe.panels.create=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u043D\u043E\u0432\u0443 \u043F\u0430\u043D\u0435\u043B\u044C
-xe.panels.customize=\u0412\u0438 \u043C\u043E\u0436\u0435\u0442\u0435 \u043D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u0442\u0438 \u0431\u0456\u0447\u043D\u0456 \u0441\u0442\u043E\u0432\u043F\u0447\u0438\u043A\u0438 \u0437\u0430 \u0434\u043E\u043F\u043E\u043C\u043E\u0433\u043E\u044E
 xe.panels.welcome.xwiki=\u041B\u0430\u0441\u043A\u0430\u0432\u043E \u043F\u0440\u043E\u0441\u0438\u043C\u043E \u0434\u043E XWiki!
 
 ### Scheduler application
@@ -2915,11 +2916,6 @@ platform.index.trashAttachmentsDeleteInProgress=\u0411\u0435\u0437\u043F\u043E\u
 platform.index.trashAttachmentsDeleteDone=\u0412\u043A\u043B\u0430\u0434\u0435\u043D\u043D\u044F \u043D\u0430\u0437\u0430\u0432\u0436\u0434\u0438 \u0432\u0438\u0434\u0430\u043B\u0435\u043D\u043E
 platform.index.trashAttachmentsDeleteFailed=\u041D\u0435 \u0432\u0434\u0430\u043B\u043E\u0441\u044F \u0432\u0438\u0434\u0430\u043B\u0438\u0442\u0438:
 
-### Space Index Page
-platform.index.spaceIndex=\u0406\u043D\u0434\u0435\u043A\u0441 \u043F\u0440\u043E\u0441\u0442\u043E\u0440\u0443
-platform.index.spaceIndexDescription=\u0421\u0442\u043E\u0440\u0456\u043D\u043A\u0438 \u0432 \u043F\u0440\u043E\u0441\u0442\u043E\u0440\u0456 {0}:
-platform.index.spaceIndexDocumentListCreate=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u043D\u043E\u0432\u0443 \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u0443
-
 ####################
 # Livetable Module
 ####################
@@ -3344,6 +3340,10 @@ XWiki.XWikiUsers_usertype_Advanced=\u0420\u043E\u0437\u0448\u0438\u0440\u0435\u0
 XWiki.XWikiUsers_phone=\u0422\u0435\u043B\u0435\u0444\u043E\u043D
 XWiki.XWikiUsers_address=\u0410\u0434\u0440\u0435\u0441\u0430
 XWiki.XWikiUsers_extensionConflictSetup=\u0423\u0432\u0456\u043C\u043A\u043D\u0443\u0442\u0438 \u043D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F \u043A\u043E\u043D\u0444\u043B\u0456\u043A\u0442\u0443 \u0440\u043E\u0437\u0448\u0438\u0440\u0435\u043D\u043D\u044F
+XWiki.XWikiUsers_underline=\u041F\u0456\u0434\u043A\u0440\u0435\u0441\u043B\u0435\u043D\u0456 \u043F\u043E\u0441\u0438\u043B\u0430\u043D\u043D\u044F
+XWiki.XWikiUsers_underline_Yes=\u0422\u0430\u043A
+XWiki.XWikiUsers_underline_OnlyInlineLinks=\u0422\u0456\u043B\u044C\u043A\u0438 \u0432\u0431\u0443\u0434\u043E\u0432\u0430\u043D\u0456 \u043F\u043E\u0441\u0438\u043B\u0430\u043D\u043D\u044F
+XWiki.XWikiUsers_underline_No=\u041D\u0456
 
 ### XWiki.XWikiSkins (core)
 XWiki.XWikiSkins_name=\u041D\u0430\u0437\u0432\u0430 \u0441\u043A\u0456\u043D\u0443
@@ -3943,6 +3943,7 @@ template.error.requirement.action=\u0414\u0456\u044F [{0}] \u043D\u0435 \u0432\u
 
 security.authservice.service.standard.name=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438\u0439 \u0410\u0432\u0442\u0435\u043D\u0442\u0438\u0444\u0456\u043A\u0430\u0442\u043E\u0440 XWiki
 security.authservice.service.standard.description=\u0410\u0432\u0442\u0435\u043D\u0442\u0438\u0444\u0456\u043A\u0430\u0442\u043E\u0440 \u0437\u0430 \u0443\u043C\u043E\u0432\u0447\u0430\u043D\u043D\u044F\u043C, \u0437\u0430\u0441\u043D\u043E\u0432\u0430\u043D\u0438\u0439 \u043D\u0430 \u043F\u0430\u0440\u043E\u043B\u044F\u0445, \u0449\u043E \u0437\u0431\u0435\u0440\u0456\u0433\u0430\u044E\u0442\u044C\u0441\u044F \u0432 \u043F\u0440\u043E\u0444\u0456\u043B\u044F\u0445 \u043A\u043E\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0456\u0432
+xe.panels.customize=\u0412\u0438 \u043C\u043E\u0436\u0435\u0442\u0435 \u043D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u0442\u0438 \u0431\u0456\u0447\u043D\u0456 \u0441\u0442\u043E\u0432\u043F\u0447\u0438\u043A\u0438 \u0437\u0430 \u0434\u043E\u043F\u043E\u043C\u043E\u0433\u043E\u044E
 admin.analytics=Google Analytics\u2122
 admin.analytics.description=\u041D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u0442\u0438 \u043E\u0431\u043B\u0456\u043A\u043E\u0432\u0438\u0439 \u0437\u0430\u043F\u0438\u0441 Google Analytics\u2122.
 admin.analytics.account.description=\u0429\u043E\u0431 \u0443\u0432\u0456\u043C\u043A\u043D\u0443\u0442\u0438 \u0441\u0442\u0435\u0436\u0435\u043D\u043D\u044F \u0437\u0430 \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u0430\u043C\u0438 \u0432 Google Analytics\u2122, \u0432\u0432\u0435\u0434\u0456\u0442\u044C \u0442\u0443\u0442 \u0441\u0432\u0456\u0439 \u043E\u0431\u043B\u0456\u043A\u043E\u0432\u0438\u0439 \u0437\u0430\u043F\u0438\u0441 Google Analytics\u2122. \u0412\u0438 \u043C\u043E\u0436\u0435\u0442\u0435 \u0432\u0432\u0435\u0441\u0442\u0438 \u0431\u0456\u043B\u044C\u0448\u0435 \u043E\u0431\u043B\u0456\u043A\u043E\u0432\u0438\u0445 \u0437\u0430\u043F\u0438\u0441\u0456\u0432 (\u0432\u0456\u0434\u043E\u043A\u0440\u0435\u043C\u043B\u0435\u043D\u0438\u0445 \u043F\u0440\u043E\u0431\u0456\u043B\u0430\u043C\u0438) \u0434\u043B\u044F \u0432\u0456\u0434\u0441\u0442\u0435\u0436\u0435\u043D\u043D\u044F \u0441\u0442\u043E\u0440\u0456\u043D\u043E\u043A \u0443 \u0434\u0435\u043A\u0456\u043B\u044C\u043A\u043E\u0445 \u043E\u0431\u043B\u0456\u043A\u043E\u0432\u0438\u0445 \u0437\u0430\u043F\u0438\u0441\u0430\u0445.
@@ -5452,6 +5453,14 @@ core.viewers.diff.nextVersion=\u041D\u0430\u0441\u0442\u0443\u043F\u043D\u0430 \
 core.viewers.diff.previousVersion=\u041F\u043E\u043F\u0435\u0440\u0435\u0434\u043D\u044F \u0432\u0435\u0440\u0441\u0456\u044F
 core.viewers.diff.nextChange=\u041D\u0430\u0441\u0442\u0443\u043F\u043D\u0430 \u0437\u043C\u0456\u043D\u0430
 core.viewers.diff.previousChange=\u041F\u043E\u043F\u0435\u0440\u0435\u0434\u043D\u044F \u0437\u043C\u0456\u043D\u0430
+xe.admin.passwordReset.step2.error.wrongParameters=\u041D\u0435\u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u0456 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438! \u0429\u0435 \u043E\u0434\u043D\u0435 \u043F\u043E\u0441\u0438\u043B\u0430\u043D\u043D\u044F \u0432\u0436\u0435 \u0431\u0443\u043B\u043E \u043D\u0430\u0434\u0456\u0441\u043B\u0430\u043D\u043E, \u0430\u0431\u043E \u0437\u0430 \u0446\u0438\u043C \u043F\u043E\u0441\u0438\u043B\u0430\u043D\u043D\u044F\u043C \u0432\u0436\u0435 \u0431\u0443\u0432 \u0432\u0438\u043A\u043E\u043D\u0430\u043D\u0438\u0439 \u043F\u0435\u0440\u0435\u0445\u0456\u0434!
+platform.core.profile.enableAccessibility=\u0423\u0432\u0456\u043C\u043A\u043D\u0443\u0442\u0438 \u043C\u043E\u0436\u043B\u0438\u0432\u043E\u0441\u0442\u0456 \u0435\u043A\u0441\u0442\u0440\u0430\u0434\u043E\u0441\u0442\u0443\u043F\u0443
+xe.panels.spaces=\u041F\u0440\u043E\u0441\u0442\u043E\u0440\u0438
+
+### Space Index Page
+platform.index.spaceIndex=\u0406\u043D\u0434\u0435\u043A\u0441 \u043F\u0440\u043E\u0441\u0442\u043E\u0440\u0443
+platform.index.spaceIndexDescription=\u0421\u0442\u043E\u0440\u0456\u043D\u043A\u0438 \u0432 \u043F\u0440\u043E\u0441\u0442\u043E\u0440\u0456 {0}:
+platform.index.spaceIndexDocumentListCreate=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u043D\u043E\u0432\u0443 \u0441\u0442\u043E\u0440\u0456\u043D\u043A\u0443
 
 ## Used to indicate where deprecated keys end
 #@deprecatedend
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/Translations.ru.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/Translations.ru.xml
index c4d220d6ec260453e529443011ae37fe743ea706..5933c3f41b00247b09554a7f7fc0264bbdafc173 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/Translations.ru.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/Translations.ru.xml
@@ -45,6 +45,7 @@
 ### Missing: panels.emptyvalue=
 panels.children.title=Дочерние страницы
 panels.siblings.title=Родственные страницы
+panels.customize=Вы можете настроить боковую колонку (колонки) с помощью {0}
 
 ## Used to indicate where deprecated keys start
 #@deprecatedstart
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/Translations.uk.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/Translations.uk.xml
index c53db4ec0c87b9d49419191cd197787af7e66e52..9d125b2ba85a881f81524e64722e1ed477f54af9 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/Translations.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/src/main/resources/Panels/Translations.uk.xml
@@ -45,6 +45,7 @@
 ### Missing: panels.emptyvalue=
 panels.children.title=Дочірні Cторінки
 panels.siblings.title=Родинні Сторінки
+panels.customize=Ви можете налаштувати бічну(і) колонку(и) за допомогою {0}
 
 ## Used to indicate where deprecated keys start
 #@deprecatedstart
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
index 0fb055e839a9fb0b999374e6f687c6e62f08330b..6bf5019e9fa33aa86a440c731a127f260542bcec 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java
@@ -745,7 +745,7 @@ void editSameMacro(TestReference testReference, TestUtils setup)
         firstMacroEditModal.clickCancel();
 
         firstEditPage.clickSaveAndView();
-        assertEquals("{{info cssClass=\"bar\" title=\"Some cool title\"}}\ntwo one\n{{/info}}\n\n ",
+        assertEquals("{{info cssClass=\"bar\" title=\"Some cool title\"}}\ntwo one\n{{/info}}",
             WikiEditPage.gotoPage(testReference).getContent());
     }
     
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/UserProfileTranslations.ru.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/UserProfileTranslations.ru.xml
index e65d14370e05ae3609bca2b884fff978de3806f6..d3c85b88f60c785cc1964a0a6f2b356953f42cef 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/UserProfileTranslations.ru.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/UserProfileTranslations.ru.xml
@@ -37,7 +37,7 @@
   <syntaxId>plain/1.0</syntaxId>
   <hidden>true</hidden>
   <content>XWiki.XWikiUsers_displayHiddenDocuments.hint=Вики содержит документы, которые не отображаются по умолчанию. Эти скрытые документы представляют собой технический контент, такой как классы приложений, страницы настройки, макросы, стили, скрипты и т.д.
-XWiki.XWikiUsers_accessibility.hint=Дополнительная доступность обеспечит различные визуальные улучшения, такие как: большие шрифты, подчеркнутые ссылки и т.д.
+XWiki.XWikiUsers_underline.hint=Выберите, будут ли ссылки подчеркнуты.
 XWiki.XWikiUsers_timezone.hint=Используйте определенный часовой пояс, чтобы даты отражали ваше текущее местоположение.
 XWiki.XWikiUsers_editor.hint=Выберите редактор по умолчанию, переопределив установленный глобально редактор по умолчанию. Если не задано, то редактор по умолчанию выбирается в зависимости от того, что редактируется.
 XWiki.XWikiUsers_usertype.hint=Выберите тип пользователя по умолчанию. Опытные пользователи получат доступ к некоторым функциям редактирования, созданию терминальных страниц и т.д.
@@ -60,5 +60,14 @@
 user.profile.network.error=Ошибка сохранения настроек уведомления
 user.profile.status.done=Готово
 user.profile.status.saving=Сохранение...
-user.profile.status.error=Ошибка сохранения пользовательского статуса</content>
+user.profile.status.error=Ошибка сохранения пользовательского статуса
+
+## Used to indicate where deprecated keys start
+#@deprecatedstart
+
+XWiki.XWikiUsers_accessibility.hint=Дополнительная доступность обеспечит различные визуальные улучшения, такие как: большие шрифты, подчеркнутые ссылки и т.д.
+
+## Used to indicate where deprecated keys end
+#@deprecatedend
+</content>
 </xwikidoc>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/UserProfileTranslations.uk.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/UserProfileTranslations.uk.xml
index 27ca0bc5a9e47bee24e96b9b31d287aff39722f4..4868d9979794b2c29e2a28d8c1d3ca3622422a33 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/UserProfileTranslations.uk.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/UserProfileTranslations.uk.xml
@@ -37,7 +37,7 @@
   <syntaxId>plain/1.0</syntaxId>
   <hidden>true</hidden>
   <content>XWiki.XWikiUsers_displayHiddenDocuments.hint=Вікі містить документи, які не відображаються за замовчуванням. Ці приховані документи являють собою технічний контент, такий як класи додатків, сторінки налаштування, макроси, стилі, скрипти і т.д.
-XWiki.XWikiUsers_accessibility.hint=Додаткова спеціальні можливості забезпечать різні візуальні покращення, такі як: великі шрифти, підкреслені посилання і т.д.
+XWiki.XWikiUsers_underline.hint=Виберіть, чи потрібно посилання підкреслювати.
 XWiki.XWikiUsers_timezone.hint=Використовуйте певний часовий пояс, щоб дати відображали ваше поточне місце розташування.
 XWiki.XWikiUsers_editor.hint=Виберіть редактор за замовчуванням, перевизначивши встановлений глобально редактор за замовчуванням. Якщо не задано, то редактор за замовчуванням вибирається залежно від того, що редагується.
 XWiki.XWikiUsers_usertype.hint=Виберіть тип користувача за замовчуванням. Розширені користувачі отримають доступ до деяких функцій редагування, створення термінальних сторінок і т.д.
@@ -61,5 +61,13 @@
 user.profile.status.done=Виконано
 user.profile.status.saving=Збереження...
 user.profile.status.error=Помилка під час збереження статусу користувача
+
+## Used to indicate where deprecated keys start
+#@deprecatedstart
+
+XWiki.XWikiUsers_accessibility.hint=Додаткова спеціальні можливості забезпечать різні візуальні покращення, такі як: великі шрифти, підкреслені посилання і т.д.
+
+## Used to indicate where deprecated keys end
+#@deprecatedend
 </content>
 </xwikidoc>