Merge branch 'staging' into improveReinstall

administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-15.sql

@@ -0,0 +1,5 @@
+--
+-- Increasing size of the URL field in com_newsfeeds
+--
+
+ALTER TABLE `#__newsfeeds` MODIFY `link` VARCHAR(2048) NOT NULL;

administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-15.sql

@@ -0,0 +1,5 @@
+--
+-- Increasing size of the URL field in com_newsfeeds
+--
+
+ALTER TABLE "#__newsfeeds" ALTER COLUMN "link" TYPE character varying(2048);

administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-15.sql

@@ -0,0 +1,5 @@
+--
+-- Increasing size of the URL field in com_newsfeeds
+--
+
+ALTER TABLE [#__newsfeeds] ALTER COLUMN [link] [nvarchar](2048) NOT NULL;

administrator/components/com_newsfeeds/sql/install.mysql.utf8.sql

@@ -7,7 +7,7 @@ CREATE TABLE IF NOT EXISTS `#__newsfeeds` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(100) NOT NULL DEFAULT '',
   `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
-  `link` varchar(200) NOT NULL DEFAULT '',
+  `link` varchar(2048) NOT NULL DEFAULT '',
   `published` tinyint(1) NOT NULL DEFAULT 0,
   `numarticles` int(10) unsigned NOT NULL DEFAULT 1,
   `cache_time` int(10) unsigned NOT NULL DEFAULT 3600,

administrator/language/en-GB/en-GB.com_config.ini

@@ -53,7 +53,7 @@ COM_CONFIG_FIELD_DATABASE_TYPE_DESC="The type of database in use, selected durin
 COM_CONFIG_FIELD_DATABASE_TYPE_LABEL="Database Type"
 COM_CONFIG_FIELD_DATABASE_USERNAME_DESC="The username for access to your database entered during the installation process. Do not edit this field unless absolutely necessary (eg the transfer of the database to a new hosting provider)."
 COM_CONFIG_FIELD_DATABASE_USERNAME_LABEL="Database Username"
-COM_CONFIG_FIELD_DEBUG_LANG_DESC="Select whether the debugging indicators (<strong>** ... **</strong>) or (<strong>?? ... ??</strong>) for the Joomla Language files will be displayed. Debug Language will work without Debug System being activated, but you will not get the additional detailed references that will help you correct any errors."
+COM_CONFIG_FIELD_DEBUG_LANG_DESC="Select if the debugging indicators (<strong>** ... **</strong>) or (<strong>?? ... ??</strong>) for the Joomla Language files will be displayed. Debug Language will work without Debug System being activated, but you will not get the additional detailed references that will help you correct any errors."
 COM_CONFIG_FIELD_DEBUG_LANG_LABEL="Debug Language"
 COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC="If enabled, diagnostic information, language translation and SQL errors (if present) will be displayed. The information will be displayed at the foot of every page you view within the Joomla Backend and Frontend. It is not advisable to leave the debug mode activated when running a live website."
 COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System"
@@ -173,7 +173,7 @@ COM_CONFIG_FIELD_SEF_REWRITE_DESC="Select to use a server's rewrite engine to ca
 COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL Rewriting"
 COM_CONFIG_FIELD_SEF_SUFFIX_DESC="If yes, the system will add a suffix to the URL based on the document type."
 COM_CONFIG_FIELD_SEF_SUFFIX_LABEL="Adds Suffix to URL"
-COM_CONFIG_FIELD_SEF_URL_DESC="Select whether or not the URLs are optimised for Search Engines."
+COM_CONFIG_FIELD_SEF_URL_DESC="Select if the URLs are optimised for Search Engines."
 COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs"
 COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC="Choose a city in the list to configure the date and time for display."
 COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL="Server Time Zone"
@@ -185,7 +185,7 @@ COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_DESC="Display or not a Frontend message wh
 COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_LABEL="Offline Message"
 COM_CONFIG_FIELD_SITE_NAME_DESC="Enter the name of your website. This will be used in various locations (eg the Backend browser title bar and <em>Site Offline</em> pages)."
 COM_CONFIG_FIELD_SITE_NAME_LABEL="Site Name"
-COM_CONFIG_FIELD_SITE_OFFLINE_DESC="Select whether access to the Site Frontend is available. If Yes, the Frontend will display or not a message depending on the settings below."
+COM_CONFIG_FIELD_SITE_OFFLINE_DESC="Select if access to the Site Frontend is available. If Yes, the Frontend will display or not a message depending on the settings below."
 COM_CONFIG_FIELD_SITE_OFFLINE_LABEL="Site Offline"
 COM_CONFIG_FIELD_SITENAME_PAGETITLES_DESC="Begin or end all Page Titles with the site name (for example, My Site Name - My Article Name)."
 COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL="Include Site Name in Page Titles"

administrator/language/en-GB/en-GB.com_contact.ini

@@ -107,7 +107,7 @@ COM_CONTACT_FIELD_ICONS_MISC_DESC="Select or upload an image for the Misc icon.
 COM_CONTACT_FIELD_ICONS_MISC_LABEL="Misc Icon"
 COM_CONTACT_FIELD_ICONS_MOBILE_DESC="Select or upload an image for the Mobile icon. If none selected, the default icon will be displayed."
 COM_CONTACT_FIELD_ICONS_MOBILE_LABEL="Mobile Icon"
-COM_CONTACT_FIELD_ICONS_SETTINGS_DESC="Choose whether to display icons, text or nothing next to the information."
+COM_CONTACT_FIELD_ICONS_SETTINGS_DESC="Show icons, text or nothing next to the information."
 COM_CONTACT_FIELD_ICONS_SETTINGS_LABEL="Settings"
 COM_CONTACT_FIELD_ICONS_TELEPHONE_DESC="Select or upload an image for the Telephone icon. If none selected, the default icon will be displayed."
 COM_CONTACT_FIELD_ICONS_TELEPHONE_LABEL="Telephone Icon"
@@ -194,7 +194,7 @@ COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC="Show or hide telephone number."
 COM_CONTACT_FIELD_PARAMS_TELEPHONE_LABEL="Telephone"
 COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC="Show or hide city or suburb."
 COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_LABEL="City or Suburb"
-COM_CONTACT_FIELD_PARAMS_VCARD_DESC="Whether or not to allow export to vCard format."
+COM_CONTACT_FIELD_PARAMS_VCARD_DESC="Show or hide a link to allow export to vCard format."
 COM_CONTACT_FIELD_PARAMS_VCARD_LABEL="vCard"
 COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC="Show or hide webpage."
 COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL="Webpage"

administrator/language/en-GB/en-GB.com_content.ini

@@ -31,7 +31,7 @@ COM_CONTENT_CONFIGURATION="Articles: Options"
 COM_CONTENT_CREATE_ARTICLE_CATEGORY_LABEL="Default Category"
 COM_CONTENT_CREATE_ARTICLE_CATEGORY_DESC="If set to 'Yes', this page will only let you create articles in the category selected below."
 COM_CONTENT_DRILL_CATEGORIES_LABEL="List or Blog: after choosing the display,<br />make sure you define the Options in the desired layout."
-COM_CONTENT_DRILL_DOWN_LAYOUT_DESC="When drilling down to a category, whether to show articles in a list or blog layout."
+COM_CONTENT_DRILL_DOWN_LAYOUT_DESC="When drilling down to a category, show articles in a list or blog layout."
 COM_CONTENT_DRILL_DOWN_LAYOUT_LABEL="List or Blog Layout"
 COM_CONTENT_EDIT_ARTICLE="Edit Article"
 COM_CONTENT_EDITORCONFIG_FIELDSET_LABEL="Configure Edit Screen"

administrator/language/en-GB/en-GB.com_finder.ini

@@ -16,16 +16,16 @@ COM_FINDER_CONFIG_DESCRIPTION_LENGTH_DESCRIPTION="Description text for search re
 COM_FINDER_CONFIG_DESCRIPTION_LENGTH_LABEL="Description Length"
 COM_FINDER_CONFIG_ENABLE_LOGGING_DESCRIPTION="Enable this option to create a log file in your site's logs folder during the index process. This file is useful for troubleshooting issues with the index process. It is recommended that logging be disabled unless necessary."
 COM_FINDER_CONFIG_ENABLE_LOGGING_LABEL="Enable Logging"
-COM_FINDER_CONFIG_EXPAND_ADVANCED_DESC="Toggle whether the advanced search options should be expanded by default."
-COM_FINDER_CONFIG_EXPAND_ADVANCED_DESCRIPTION="Toggle whether the advanced search options should be expanded by default."
+COM_FINDER_CONFIG_EXPAND_ADVANCED_DESC="Toggle if the advanced search options should be expanded by default."
+COM_FINDER_CONFIG_EXPAND_ADVANCED_DESCRIPTION="Toggle if the advanced search options should be expanded by default."
 COM_FINDER_CONFIG_EXPAND_ADVANCED_LABEL="Expand Advanced Search"
 COM_FINDER_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_DESCRIPTION="Description displayed for this site as a search provider."
 COM_FINDER_CONFIG_FIELD_OPENSEARCH_DESCRIPTON_LABEL="OpenSearch Description"
 COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_DESCRIPTION="Name displayed for this site as a search provider."
 COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_LABEL="OpenSearch Name"
 COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_DESCRIPTION="Record the search phrases submitted by visitors."
 COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_LABEL="Gather Search Statistics"
-COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_DESCRIPTION="Toggle whether search terms should be highlighted in search results."
+COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_DESCRIPTION="Toggle if search terms should be highlighted in search results."
 COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_LABEL="Highlight Search Terms"
 COM_FINDER_CONFIG_IMPORT_EXPORT="Import/Export"
 COM_FINDER_CONFIG_IMPORT_EXPORT_HELP="Help"
@@ -41,20 +41,20 @@ COM_FINDER_CONFIG_MISC_MULTIPLIER_DESCRIPTION="The multiplier is used to control
 COM_FINDER_CONFIG_MISC_MULTIPLIER_LABEL="Miscellaneous Text Weight Multiplier"
 COM_FINDER_CONFIG_PATH_MULTIPLIER_DESCRIPTION="The multiplier is used to control how much influence matching text has on the overall relevance score of a search result. A multiplier is considered in relationship to the other multipliers. The path text comes from the SEF URL of the content."
 COM_FINDER_CONFIG_PATH_MULTIPLIER_LABEL="Path Text Weight Multiplier"
-COM_FINDER_CONFIG_SHOW_ADVANCED_DESC="Toggle whether users should be able to see advanced search options."
-COM_FINDER_CONFIG_SHOW_ADVANCED_DESCRIPTION="Toggle whether users should be able to see advanced search options."
+COM_FINDER_CONFIG_SHOW_ADVANCED_DESC="Toggle if users should be able to see advanced search options."
+COM_FINDER_CONFIG_SHOW_ADVANCED_DESCRIPTION="Toggle if users should be able to see advanced search options."
 COM_FINDER_CONFIG_SHOW_ADVANCED_LABEL="Advanced Search"
-COM_FINDER_CONFIG_SHOW_ADVANCED_TIPS_DESCRIPTION="Toggle whether users should be able to see advanced search tips."
+COM_FINDER_CONFIG_SHOW_ADVANCED_TIPS_DESCRIPTION="Toggle if users should be able to see advanced search tips."
 COM_FINDER_CONFIG_SHOW_ADVANCED_TIPS_LABEL="Advanced Tips"
-COM_FINDER_CONFIG_SHOW_AUTOSUGGEST_DESCRIPTION="Toggle whether automatic search suggestions should be displayed."
+COM_FINDER_CONFIG_SHOW_AUTOSUGGEST_DESCRIPTION="Toggle if automatic search suggestions should be displayed."
 COM_FINDER_CONFIG_SHOW_AUTOSUGGEST_LABEL="Search Suggestions"
 COM_FINDER_CONFIG_SHOW_DATE_FILTERS_DESC="Show the start and end date filters in the advanced search."
 COM_FINDER_CONFIG_SHOW_DATE_FILTERS_DESCRIPTION="Show the start and end date filters in the advanced search."
 COM_FINDER_CONFIG_SHOW_DATE_FILTERS_LABEL="Date Filters"
-COM_FINDER_CONFIG_SHOW_DESCRIPTION_DESC="Toggle whether the description should be displayed with search results."
-COM_FINDER_CONFIG_SHOW_DESCRIPTION_DESCRIPTION="Toggle whether the description should be displayed with search results."
+COM_FINDER_CONFIG_SHOW_DESCRIPTION_DESC="Toggle if the description should be displayed with search results."
+COM_FINDER_CONFIG_SHOW_DESCRIPTION_DESCRIPTION="Toggle if the description should be displayed with search results."
 COM_FINDER_CONFIG_SHOW_DESCRIPTION_LABEL="Result Description"
-COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_DESC="Whether to show a detailed explanation of the search requested."
+COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_DESC="Show or hide a detailed explanation of the search requested."
 COM_FINDER_CONFIG_SHOW_EXPLAINED_QUERY_LABEL="Query Explanation"
 COM_FINDER_CONFIG_SHOW_FEED_DESC="Show the syndication feed link."
 COM_FINDER_CONFIG_SHOW_FEED_LABEL="Show Feed"

administrator/language/en-GB/en-GB.com_installer.ini

@@ -5,7 +5,7 @@
 
 COM_INSTALLER="Installer"
 COM_INSTALLER_AUTHOR_INFORMATION="Author Information"
-COM_INSTALLER_CACHETIMEOUT_DESC="For how many hours should Joomla cache extension update information."
+COM_INSTALLER_CACHETIMEOUT_DESC="For how many hours should Joomla cache update information. This is also the cache time for the Update Notification Plugin, if enabled"
 COM_INSTALLER_CACHETIMEOUT_LABEL="Updates Caching (in hours)"
 COM_INSTALLER_CONFIGURATION="Installer: Options"
 COM_INSTALLER_CONFIRM_UNINSTALL="Are you sure you want to uninstall? Confirming will permanently delete the selected item(s)!"

administrator/language/en-GB/en-GB.com_languages.ini

@@ -22,7 +22,7 @@ COM_LANGUAGES_OVERRIDE_ERROR_RESERVED_WORDS="YES, NO, NULL, FALSE, ON, OFF, NONE
 COM_LANGUAGES_OVERRIDE_FIELD_BOTH_LABEL="For Both Locations"
 COM_LANGUAGES_OVERRIDE_FIELD_BOTH_DESC="If this box is checked the override will be stored for both administrator (Backend) and site (Frontend). This is essential for creating language overrides for some plugins because their language files, while stored in backend, are also used in frontend (example: plg_content_vote).<br />Please note that the two overrides will be completely independent from each other after storing them."
 COM_LANGUAGES_OVERRIDE_FIELD_CLIENT_LABEL="Location"
-COM_LANGUAGES_OVERRIDE_FIELD_CLIENT_DESC="Indicates whether the override is created for the site (Frontend) or Administrator (Backend) client."
+COM_LANGUAGES_OVERRIDE_FIELD_CLIENT_DESC="Indicates if the override is created for the site (Frontend) or Administrator (Backend) client."
 COM_LANGUAGES_OVERRIDE_FIELD_FILE_LABEL="File"
 COM_LANGUAGES_OVERRIDE_FIELD_FILE_DESC="Language overrides are stored in a specific INI file (as it's the case for the original texts, too). Here you can see in which file the current override is stored."
 COM_LANGUAGES_OVERRIDE_FIELD_LANGUAGE_LABEL="Language"
@@ -34,7 +34,7 @@ COM_LANGUAGES_OVERRIDE_FIELD_OVERRIDE_DESC="Enter the text that you want to be d
 COM_LANGUAGES_OVERRIDE_FIELD_SEARCHSTRING_LABEL="Search Text"
 COM_LANGUAGES_OVERRIDE_FIELD_SEARCHSTRING_DESC="Please enter the text to search for here. It may be in any of the language files."
 COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_LABEL="Search For"
-COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_DESC="Select whether you want to search for constant names or the values (the actual text)."
+COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_DESC="Select if you want to search for constant names or the values (the actual text)."
 COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_CONSTANT="Constant"
 COM_LANGUAGES_OVERRIDE_FIELD_SEARCHTYPE_TEXT="Value"
 COM_LANGUAGES_FIELD_PUBLISHED_DESC="Whether this content language is published or not. If published, it will display as a choice in the Language Switcher module in Frontend."

administrator/language/en-GB/en-GB.com_menus.ini

@@ -109,7 +109,7 @@ COM_MENUS_ITEM_FIELD_PAGE_TITLE_DESC="Optional text for the "Browser page t
 COM_MENUS_ITEM_FIELD_PAGE_TITLE_LABEL="Browser Page Title"
 COM_MENUS_ITEM_FIELD_PARENT_DESC="Select a parent item."
 COM_MENUS_ITEM_FIELD_PARENT_LABEL="Parent Item"
-COM_MENUS_ITEM_FIELD_SECURE_DESC="Selects whether or not this link should use HTTPS (encrypted HTTP connections with the https:// protocol prefix). Note, you must have HTTPS enabled on your server to utilise this option."
+COM_MENUS_ITEM_FIELD_SECURE_DESC="Selects if this link should use HTTPS (encrypted HTTP connections with the https:// protocol prefix). Note, you must have HTTPS enabled on your server to utilise this option."
 COM_MENUS_ITEM_FIELD_SECURE_LABEL="Secure"
 COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_DESC="Show or hide the Browser Page Title in the heading of the page ( If no optional text entered - will default to value based on the Menu Item Title ). The Page heading is usually displayed inside the "H1" tag."
 COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_LABEL="Show Page Heading"

administrator/language/en-GB/en-GB.com_modules.ini

@@ -34,7 +34,7 @@ COM_MODULES_FIELD_AUTOMATIC_TITLE_LABEL="Automatic Title"
 COM_MODULES_FIELD_AUTOMATIC_TITLE_DESC="Set yes if you want an automatic translated title. Its use depends on the Administrator template."
 COM_MODULES_FIELD_CACHE_TIME_DESC="The time in seconds before the module is recached."
 COM_MODULES_FIELD_CACHE_TIME_LABEL="Cache Time"
-COM_MODULES_FIELD_CACHING_DESC="Select whether to cache the content of this module."
+COM_MODULES_FIELD_CACHING_DESC="Use the global setting for cache for the content of this module or disable caching for this module."
 COM_MODULES_FIELD_CACHING_LABEL="Caching"
 COM_MODULES_FIELD_CLIENT_ID_DESC="The location of the module, Frontend or Backend. You can't change this value."
 COM_MODULES_FIELD_CLIENT_ID_LABEL="Module Location"

administrator/language/en-GB/en-GB.com_tags.ini

@@ -169,7 +169,7 @@ COM_TAGS_TAG_LIST_SHOW_HEADINGS_DESC="Show or hide the headings in the compact l
 COM_TAGS_TAG_LIST_SHOW_HEADINGS_LABEL="Table Headings"
 COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_DESC="Shows the image for each item."
 COM_TAGS_TAG_LIST_SHOW_ITEM_IMAGE_LABEL="Item Image"
-COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_DESC="Whether to show or hide the description for each item in the list. The length may be limited using the Maximum Characters option."
+COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_DESC="Show or hide the description for each item in the list. The length may be limited using the Maximum Characters option."
 COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_LABEL="Item Description"
 COM_TAGS_TAG_VIEW_LIST_DESC="Displays a compact list of items with the selected tags."
 COM_TAGS_TAG_VIEW_LIST_OPTION="List view options"