Skip to content

Commit

Permalink
Merge branch 'staging' into 3.8-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
wilsonge committed Feb 20, 2017
2 parents c628af2 + bad24c4 commit 3145faf
Show file tree
Hide file tree
Showing 25 changed files with 670 additions and 789 deletions.
@@ -0,0 +1,8 @@
-- Normalize contact_details table default values.
ALTER TABLE `#__contact_details` MODIFY `name` varchar(255) NOT NULL;
ALTER TABLE `#__contact_details` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL;
ALTER TABLE `#__contact_details` MODIFY `sortname1` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `#__contact_details` MODIFY `sortname2` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `#__contact_details` MODIFY `sortname3` varchar(255) NOT NULL DEFAULT '';
ALTER TABLE `#__contact_details` MODIFY `language` varchar(7) NOT NULL;
ALTER TABLE `#__contact_details` MODIFY `xreference` varchar(50) NOT NULL DEFAULT '' COMMENT 'A reference to enable linkages to external data sets.';
@@ -0,0 +1,8 @@
-- Normalize contact_details table default values.
ALTER TABLE "#__contact_details" ALTER COLUMN "name" DROP DEFAULT;
ALTER TABLE "#__contact_details" ALTER COLUMN "alias" DROP DEFAULT;
ALTER TABLE "#__contact_details" ALTER COLUMN "sortname1" SET DEFAULT '';
ALTER TABLE "#__contact_details" ALTER COLUMN "sortname2" SET DEFAULT '';
ALTER TABLE "#__contact_details" ALTER COLUMN "sortname3" SET DEFAULT '';
ALTER TABLE "#__contact_details" ALTER COLUMN "language" DROP DEFAULT;
ALTER TABLE "#__contact_details" ALTER COLUMN "xreference" SET DEFAULT '';

Large diffs are not rendered by default.

@@ -0,0 +1,21 @@
-- Normalize contact_details table default values.
DECLARE @table AS nvarchar(32)
DECLARE @constraintName AS nvarchar(100)
DECLARE @constraintQuery AS nvarchar(1000)
SET QUOTED_IDENTIFIER OFF
SET @table = "#__contact_details"
SET QUOTED_IDENTIFIER ON
SELECT @constraintName = name FROM sys.default_constraints
WHERE parent_object_id = object_id(@table)
AND parent_column_id = columnproperty(object_id(@table), 'name', 'ColumnId')
SET @constraintQuery = 'ALTER TABLE [' + @table + '] DROP CONSTRAINT [' + @constraintName + ']'
EXECUTE sp_executesql @constraintQuery;

ALTER TABLE [#__contact_details] ADD DEFAULT (0) FOR [published];
ALTER TABLE [#__contact_details] ADD DEFAULT (0) FOR [checked_out];
ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [created_by_alias];

ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [sortname1];
ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [sortname2];
ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [sortname3];
ALTER TABLE [#__contact_details] ADD DEFAULT ('') FOR [xreference];
2 changes: 1 addition & 1 deletion administrator/components/com_menus/models/forms/menu.xml
Expand Up @@ -50,7 +50,7 @@
label="COM_MENUS_MENU_CLIENT_ID_LABEL"
description="COM_MENUS_MENU_CLIENT_ID_DESC"
default="0"
class="btn-group"
class="btn-group btn-group-yesno btn-group-reversed"
required="true"
>
<option value="0">JSITE</option>
Expand Down
5 changes: 0 additions & 5 deletions administrator/language/en-GB/en-GB.com_contact.ini
Expand Up @@ -307,8 +307,3 @@ JGLOBAL_FIELDSET_MISCELLANEOUS="Miscellaneous Information"
JGLOBAL_NEWITEMSLAST_DESC="New Contacts default to the last position. Ordering can be changed after this Contact is saved."
JLIB_HTML_BATCH_USER_LABEL="Set Linked User"
JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting."

; Fields overrides
COM_CONTACT_CONTACT_CATEGORIES_TITLE="Contacts: Field Groups"
COM_CONTACT_CONTACT_CATEGORY_ADD_TITLE="Contacts: New Field Group"
COM_CONTACT_CONTACT_CATEGORY_EDIT_TITLE="Contacts: Edit Field Group"
5 changes: 0 additions & 5 deletions administrator/language/en-GB/en-GB.com_content.ini
Expand Up @@ -200,8 +200,3 @@ JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new ar
JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these articles."
JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting."
JLIB_RULES_SETTING_NOTES_ITEM="Changes apply to this article only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting."

; Fields overrides
COM_CONTENT_ARTICLE_CATEGORIES_TITLE="Articles: Field Groups"
COM_CONTENT_ARTICLE_CATEGORY_ADD_TITLE="Articles: New Field Group"
COM_CONTENT_ARTICLE_CATEGORY_EDIT_TITLE="Articles: Edit Field Group"
2 changes: 0 additions & 2 deletions administrator/language/en-GB/en-GB.com_menus.ini
Expand Up @@ -85,8 +85,6 @@ COM_MENUS_ITEM_FIELD_ASSIGNED_LABEL=" Menu"
COM_MENUS_ITEM_FIELD_ASSOCIATION_NO_VALUE="- No association -"
COM_MENUS_ITEM_FIELD_BROWSERNAV_DESC="Target browser window when the menu item is selected."
COM_MENUS_ITEM_FIELD_BROWSERNAV_LABEL="Target Window"
COM_MENUS_ITEM_FIELD_CLIENT_ID_DESC="Choose the client application menu"
COM_MENUS_ITEM_FIELD_CLIENT_ID_LABEL="Client"
COM_MENUS_ITEM_FIELD_COMPONENTS_CONTAINER_HIDE_ITEMS_DESC="Select the menu items that should be shown or not under this container. If there are no items to show, then this container will also be hidden.<br>Please note that when you install a new component it will be displayed by default until you come back here and hide it too."
COM_MENUS_ITEM_FIELD_COMPONENTS_CONTAINER_HIDE_ITEMS_LABEL="Show or Hide Menu Items"
COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED="Hide Unassigned Modules"
Expand Down
3 changes: 1 addition & 2 deletions administrator/language/en-GB/en-GB.com_plugins.sys.ini
Expand Up @@ -4,7 +4,6 @@
; Note : All ini files need to be saved as UTF-8

COM_PLUGINS="Plugins"
COM_PLUGINS_XML_DESCRIPTION="This component manages Joomla plugins."

COM_PLUGINS_PLUGINS_VIEW_DEFAULT_DESC="Shows a list of plugins to manage"
COM_PLUGINS_PLUGINS_VIEW_DEFAULT_TITLE="Plugin Manager"
COM_PLUGINS_XML_DESCRIPTION="This component manages Joomla plugins."
3 changes: 1 addition & 2 deletions administrator/language/en-GB/en-GB.com_postinstall.sys.ini
Expand Up @@ -4,7 +4,6 @@
; Note : All ini files need to be saved as UTF-8

COM_POSTINSTALL="Post-installation Messages"
COM_POSTINSTALL_XML_DESCRIPTION="Displays post-installation and post-upgrade messages for Joomla! and its extensions."

COM_POSTINSTALL_MESSAGES_VIEW_DEFAULT_DESC="Displays post-installation and post-upgrade messages for Joomla! and its extensions."
COM_POSTINSTALL_MESSAGES_VIEW_DEFAULT_TITLE="Post-Installation Messages"
COM_POSTINSTALL_XML_DESCRIPTION="Displays post-installation and post-upgrade messages for Joomla! and its extensions."
3 changes: 1 addition & 2 deletions administrator/language/en-GB/en-GB.com_templates.sys.ini
Expand Up @@ -4,9 +4,8 @@
; Note : All ini files need to be saved as UTF-8

COM_TEMPLATES="Templates"
COM_TEMPLATES_XML_DESCRIPTION="This component manages templates."

COM_TEMPLATES_STYLE_VIEW_DEFAULT_DESC="Shows a List of Template styles"
COM_TEMPLATES_STYLE_VIEW_DEFAULT_TITLE="Template Styles"
COM_TEMPLATES_TEMPLATES_VIEW_DEFAULT_DESC="Shows a List of Installed Templates"
COM_TEMPLATES_TEMPLATES_VIEW_DEFAULT_TITLE="Templates"
COM_TEMPLATES_XML_DESCRIPTION="This component manages templates."
31 changes: 13 additions & 18 deletions administrator/language/en-GB/en-GB.com_users.ini
Expand Up @@ -3,19 +3,6 @@
; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
; Note : All ini files need to be saved as UTF-8

COM_CATEGORIES_CATEGORY_ADD_TITLE="User Notes: New Category"
COM_CATEGORIES_CATEGORY_EDIT_TITLE="User Notes: Edit Category"
COM_USERS_OPTION_FILTER_DATE="- Select Registration Date -"
COM_USERS_OPTION_FILTER_LAST_VISIT_DATE="- Select Last Visit Date -"
COM_USERS_OPTION_RANGE_NEVER="never"
COM_USERS_OPTION_RANGE_PAST_1MONTH="in the last month"
COM_USERS_OPTION_RANGE_PAST_3MONTH="in the last 3 months"
COM_USERS_OPTION_RANGE_PAST_6MONTH="in the last 6 months"
COM_USERS_OPTION_RANGE_PAST_WEEK="in the last week"
COM_USERS_OPTION_RANGE_PAST_YEAR="in the last year"
COM_USERS_OPTION_RANGE_POST_YEAR="more than a year ago"
COM_USERS_OPTION_RANGE_TODAY="today"

COM_USERS="Users"
COM_USERS_ACTIONS_AVAILABLE="Actions Permitted"
COM_USERS_ACTIVATED="Activated"
Expand Down Expand Up @@ -266,6 +253,16 @@ COM_USERS_NOTES_N_ITEMS_TRASHED="%d User Notes successfully trashed."
COM_USERS_NOTES_N_ITEMS_TRASHED_1="%d User Note successfully trashed."
COM_USERS_NOTES_N_ITEMS_UNPUBLISHED="%d User Notes successfully unpublished."
COM_USERS_NOTES_N_ITEMS_UNPUBLISHED_1="%d User Note successfully unpublished."
COM_USERS_OPTION_FILTER_DATE="- Select Registration Date -"
COM_USERS_OPTION_FILTER_LAST_VISIT_DATE="- Select Last Visit Date -"
COM_USERS_OPTION_RANGE_NEVER="never"
COM_USERS_OPTION_RANGE_PAST_1MONTH="in the last month"
COM_USERS_OPTION_RANGE_PAST_3MONTH="in the last 3 months"
COM_USERS_OPTION_RANGE_PAST_6MONTH="in the last 6 months"
COM_USERS_OPTION_RANGE_PAST_WEEK="in the last week"
COM_USERS_OPTION_RANGE_PAST_YEAR="in the last year"
COM_USERS_OPTION_RANGE_POST_YEAR="more than a year ago"
COM_USERS_OPTION_RANGE_TODAY="today"
COM_USERS_OPTION_LEVEL_CATEGORY="%d (top category)"
COM_USERS_OPTION_LEVEL_COMPONENT="%d (component)"
COM_USERS_OPTION_LEVEL_DEEPER="%d (deeper)"
Expand Down Expand Up @@ -373,8 +370,6 @@ COM_USERS_VIEW_NOTES_TITLE="User Notes"
COM_USERS_VIEW_USERS_TITLE="Users"
COM_USERS_XML_DESCRIPTION="Component for managing users"
JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting."

; Fields overrides
COM_USERS_USER_CATEGORIES_TITLE="Users: Field Groups"
COM_USERS_USER_CATEGORY_ADD_TITLE="Users: New Field Group"
COM_USERS_USER_CATEGORY_EDIT_TITLE="Users: Edit Field Group"
; Categories overrides
COM_CATEGORIES_CATEGORY_ADD_TITLE="User Notes: New Category"
COM_CATEGORIES_CATEGORY_EDIT_TITLE="User Notes: Edit Category"
3 changes: 1 addition & 2 deletions administrator/language/en-GB/en-GB.com_users.sys.ini
Expand Up @@ -4,8 +4,6 @@
; Note : All ini files need to be saved as UTF-8

COM_USERS="Users"
COM_USERS_XML_DESCRIPTION="Component for managing users."

COM_USERS_CONTENT_TYPE_CATEGORY="User Notes Category"
COM_USERS_CONTENT_TYPE_NOTE="User Notes"
COM_USERS_CONTENT_TYPE_USER="User"
Expand Down Expand Up @@ -49,3 +47,4 @@ COM_USER_REMIND_VIEW_DEFAULT_TITLE="Username Reminder Request"
COM_USER_RESET_VIEW_DEFAULT_DESC="Displays a request to reset password."
COM_USER_RESET_VIEW_DEFAULT_OPTION="Default"
COM_USER_RESET_VIEW_DEFAULT_TITLE="Password Reset"
COM_USERS_XML_DESCRIPTION="Component for managing users."
1 change: 1 addition & 0 deletions components/com_content/views/form/tmpl/edit.php
Expand Up @@ -12,6 +12,7 @@
JHtml::_('behavior.tabstate');
JHtml::_('behavior.keepalive');
JHtml::_('behavior.formvalidator');
JHtml::_('formbehavior.chosen', '#jform_catid', null, array('disable_search_threshold' => 0));
JHtml::_('formbehavior.chosen', 'select');

// Create shortcut to parameters.
Expand Down
10 changes: 5 additions & 5 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 29 additions & 14 deletions installation/language/pt-BR/pt-BR.ini
Expand Up @@ -29,7 +29,7 @@ INSTL_PRECHECK_ACTUAL="Atual"
; Database view
INSTL_DATABASE="Configuração do Banco de Dados"
INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Consulta ao banco PostgreSQL falhou."
INSTL_DATABASE_HOST_DESC="Costuma ser "_QQ_"localhost"_QQ_"."
INSTL_DATABASE_HOST_DESC="Isso geralmente é "_QQ_"localhost"_QQ_" ou um nome fornecido pela empresa de hospedagem."
INSTL_DATABASE_HOST_LABEL="Nome do servidor"
INSTL_DATABASE_NAME_DESC="Alguns servidores permitem apenas um nome específico de Banco de Dados por site. Neste caso, use o prefixo de tabelas para diferentes sites Joomla."
INSTL_DATABASE_NAME_LABEL="Nome do banco de dados"
Expand All @@ -43,7 +43,7 @@ INSTL_DATABASE_PREFIX_LABEL="Prefixo das tabelas"
INSTL_DATABASE_PREFIX_MSG="O prefixo de tabela deve começar com uma letra, seguido por caracteres alfanuméricos opcionais e por um sublinhado"
INSTL_DATABASE_TYPE_DESC="Provavelmente é "_QQ_"MySQLi"_QQ_"."
INSTL_DATABASE_TYPE_LABEL="Tipo de Banco de dados"
INSTL_DATABASE_USER_DESC="Algo como "_QQ_"root"_QQ_" ou um nome de usuário dado pelo local de hospedagem."
INSTL_DATABASE_USER_DESC="Um nome de usuário que você criou ou fornecido pelo seu local de hospedagem."
INSTL_DATABASE_USER_LABEL="Nome de Usuário"


Expand All @@ -66,7 +66,7 @@ INSTL_FTP_PASSWORD_DESC="ATENÇÃO! Recomenda-se deixar em branco e informar sua

;Site View
INSTL_SITE="Configurações Principais"
INSTL_ADMIN_EMAIL_LABEL="Email do Administrador"
INSTL_ADMIN_EMAIL_LABEL="E-mail do administrador"
INSTL_ADMIN_EMAIL_DESC="Informe um endereço de email. Este será o endereço de email do Super Usuário do site."
INSTL_ADMIN_PASSWORD_LABEL="Senha do Administrador"
INSTL_ADMIN_PASSWORD_DESC="Defina a senha para a conta do Super Usuário e confirme no campo abaixo."
Expand All @@ -93,6 +93,7 @@ INSTL_SAMPLE_BROCHURE_SET_DESC="Instale o Joomla com algumas páginas (um menu c
INSTL_SAMPLE_DATA_SET_DESC="Instale o Joomla com uma página (um menu com um link) e módulos como Últimos Artigos, Formulário de Acesso."
INSTL_SAMPLE_LEARN_SET_DESC="Instale o Joomla com conteúdo de exemplo que descrevem como o Joomla funciona."
INSTL_SAMPLE_TESTING_SET_DESC="Instale o Joomla com todos os itens de menu possíveis para ajudar a testar o Joomla."
INSTL_SUPER_USER_TITLE="Detalhes da conta do super usuário"

;Summary view
INSTL_FINALISATION="Finalização"
Expand Down Expand Up @@ -159,18 +160,19 @@ INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla definiu %s como o idioma padrão
INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Selecione"
INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Idioma"
INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Tag"
INSTL_DEFAULTLANGUAGE_COULD_NOT_ADD_ASSOCIATIONS="Joomla não pode criar automaticamente as associações de idiomas."
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla não pode criar automaticamente o idioma de conteúdo %s"
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla não pode criar automaticamente o menu %s"
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla não pode criar automaticamente o item de menu home %s"
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla não pode criar automaticamente o módulo de menu %s"
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla não pode criar automaticamente a categoria de conteúdo %s"
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla não pode criar automaticamente o artigo %s localizado"
INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla não pode publicar automaticamente o módulo de troca de idiomas"
INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla não pode ativar automaticamente o Plugin de código de idioma"
INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla não pode ativar automaticamente o Plugin filtro de idioma"
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla não pode criar automaticamente o menu %s."
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla não pode criar automaticamente o item de menu inicial %s."
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla não pode criar automaticamente o módulo de menu %s."
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla não pode criar automaticamente a categoria de conteúdo %s."
INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla não pode criar automaticamente o artigo localizado %s."
INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla não pode publicar automaticamente o módulo de troca de idiomas."
INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla não pode ativar automaticamente o Plugin de Código de Idioma."
INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla não pode ativar automaticamente o Plugin Filtro de Idioma."
INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla não pôde instalar o idioma %s."
INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla não pode publicar automaticamente o módulo de estado de idioma"
INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla não pode despublicar automaticamente o módulo de menu padrão"
INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla não pode publicar automaticamente o módulo de estado de idioma."
INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla não pode despublicar automaticamente o módulo de menu padrão."
INSTL_DEFAULTLANGUAGE_DESC="Joomla instalou os idiomas a seguir. Selecione o padrão desejado para o administrador Joomla."
INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla instalou os seguintes idiomas. Selecione o padrão desejado para o Site."
INSTL_DEFAULTLANGUAGE_FRONTEND="Idioma padrão do Site "
Expand Down Expand Up @@ -276,7 +278,7 @@ JCHECK_AGAIN="Verificar Novamente"
JERROR="Erro"
JEMAIL="Email"
JGLOBAL_ISFREESOFTWARE="%s é um software gratuito distribuído sob a %s."
JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="O pacote de idioma não coincide com a versão do Joomla!. Algumas strings podem estar faltando."
JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="O pacote de idioma não coincide com essa versão do Joomla! Algumas strings podem estar faltando e serão exibidas em inglês."
JGLOBAL_SELECT_AN_OPTION="Selecione uma opção"
JGLOBAL_SELECT_NO_RESULTS_MATCH="Nenhum resultado correspondente "
JGLOBAL_SELECT_SOME_OPTIONS="Selecione algumas opções"
Expand Down Expand Up @@ -326,3 +328,16 @@ SQLAZURE="Microsoft SQL Azure"
SQLITE="SQLite"
SQLSRV="Microsoft SQL Server"

; Javascript message titles
ERROR="Erro"
MESSAGE="Mensagem"
NOTICE="Observação"
WARNING="Aviso"

; Javascript ajax error messages
JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A conexão foi abortada ao solicitar os dados JSON."
JLIB_JS_AJAX_ERROR_NO_CONTENT="Nenhum conteúdo foi retornado."
JLIB_JS_AJAX_ERROR_OTHER="Ocorreu um erro ao buscar os dados JSON: código de status HTTP %s."
JLIB_JS_AJAX_ERROR_PARSE="Ocorreu um erro de interpretação ao processar os dados JSON a seguir: <br/> <code style="_QQ_"color:inherit;white-space:pre;padding:0;margin:0;border:0;background:inherit;"_QQ_">%s</code>"
JLIB_JS_AJAX_ERROR_TIMEOUT="O limite de tempo esgotou-se ao buscar os dados JSON."

11 changes: 6 additions & 5 deletions installation/language/pt-BR/pt-BR.xml
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<metafile
version="3.6"
version="3.7"
client="installation">
<name>Português do Brasil (pt-BR)</name>
<version>3.6.1</version>
<creationDate>2016-07-24</creationDate>
<author>Equipe de Tradução Português Brasileiro</author>
<copyright>Copyright (C) 2005-2015 Open Source Matters. Todos os direitos reservados.</copyright>
<version>3.7.0</version>
<creationDate>Fevereiro de 2017</creationDate>
<author>Equipe de Tradução pt-BR (Português do Brasil)</author>
<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<files>
<filename>pt-BR.ini</filename>
</files>
<metadata>
<name>Português do Brasil (pt-BR)</name>
<nativeName>Português do Brasil (pt-BR)</nativeName>
<tag>pt-BR</tag>
<rtl>0</rtl>
</metadata>
Expand Down

0 comments on commit 3145faf

Please sign in to comment.