diff --git a/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-15.sql b/administrator/components/com_admin/sql/updates/mysql/3.6.3-2016-08-15.sql new file mode 100644 index 0000000000000..586c542e30e92 --- /dev/null +++ b/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; diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-15.sql b/administrator/components/com_admin/sql/updates/postgresql/3.6.3-2016-08-15.sql new file mode 100644 index 0000000000000..6ece41aed6f3a --- /dev/null +++ b/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); diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-15.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.6.3-2016-08-15.sql new file mode 100644 index 0000000000000..515854cd88735 --- /dev/null +++ b/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; diff --git a/administrator/components/com_newsfeeds/sql/install.mysql.utf8.sql b/administrator/components/com_newsfeeds/sql/install.mysql.utf8.sql index c368c5d330e1a..da029c00d6067 100644 --- a/administrator/components/com_newsfeeds/sql/install.mysql.utf8.sql +++ b/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, diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 1e8e48ca5fa7f..18e839c70933e 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/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 (** ... **) or (?? ... ??) 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 (** ... **) or (?? ... ??) 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 Site Offline 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" diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini index bd655620942dd..90029b733257a 100644 --- a/administrator/language/en-GB/en-GB.com_contact.ini +++ b/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" diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini index 74839a3eb692e..4ca1d2a7e0fb8 100644 --- a/administrator/language/en-GB/en-GB.com_content.ini +++ b/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,
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" diff --git a/administrator/language/en-GB/en-GB.com_finder.ini b/administrator/language/en-GB/en-GB.com_finder.ini index e297fa7e1d0f5..af64f74d33005 100644 --- a/administrator/language/en-GB/en-GB.com_finder.ini +++ b/administrator/language/en-GB/en-GB.com_finder.ini @@ -16,8 +16,8 @@ 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" @@ -25,7 +25,7 @@ COM_FINDER_CONFIG_FIELD_OPENSEARCH_NAME_DESCRIPTION="Name displayed for this sit 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" diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini index 172136a154197..12d958a2ae627 100644 --- a/administrator/language/en-GB/en-GB.com_installer.ini +++ b/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)!" diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini index e8372fbc83d88..d073cf6f7f001 100644 --- a/administrator/language/en-GB/en-GB.com_languages.ini +++ b/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).
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." diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini index 13b1e3d7365eb..d3aa59bc2980e 100644 --- a/administrator/language/en-GB/en-GB.com_menus.ini +++ b/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" diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini index 65db2f351cf82..4b6729948bb90 100644 --- a/administrator/language/en-GB/en-GB.com_modules.ini +++ b/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" diff --git a/administrator/language/en-GB/en-GB.com_tags.ini b/administrator/language/en-GB/en-GB.com_tags.ini index c95aef1862edd..d2fb80bd62dae 100644 --- a/administrator/language/en-GB/en-GB.com_tags.ini +++ b/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" diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index 2f30d77f274d0..39c4ecb1728c0 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -224,9 +224,9 @@ JFIELD_OPTION_NONE="None" JFIELD_ORDERING_DESC="Select the ordering." JFIELD_ORDERING_LABEL="Ordering" JFIELD_PARAMS_LABEL="Options" -JFIELD_PLG_SEARCH_ALL_DESC="Indicate whether to include published items in the search." +JFIELD_PLG_SEARCH_ALL_DESC="Include published items in the search." JFIELD_PLG_SEARCH_ALL_LABEL="Search Published" -JFIELD_PLG_SEARCH_ARCHIVED_DESC="Indicate whether to include archived items in the search." +JFIELD_PLG_SEARCH_ARCHIVED_DESC="Include archived items in the search." JFIELD_PLG_SEARCH_ARCHIVED_LABEL="Search Archived" JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC="Sets the maximum number of results to return." JFIELD_PLG_SEARCH_SEARCHLIMIT_LABEL="Search Limit" @@ -253,7 +253,7 @@ JGLOBAL_ALLOW_RATINGS_LABEL="Allow Ratings" JGLOBAL_ARCHIVE_ARTICLES_FIELD_INTROTEXTLIMIT_DESC="Please enter in a numeric character limit value. The introtext will be trimmed to the number of characters you enter." JGLOBAL_ARCHIVE_ARTICLES_FIELD_INTROTEXTLIMIT_LABEL="Intro text Limit" JGLOBAL_ARCHIVE_OPTIONS="Archive" -JGLOBAL_ARTICLE_COUNT_DESC="Whether to show or hide a count of articles in each category." +JGLOBAL_ARTICLE_COUNT_DESC="Show or hide a count of articles in each category." JGLOBAL_ARTICLE_COUNT_LABEL="Article Count" JGLOBAL_ARTICLE_MANAGER_ORDER="Ordering" JGLOBAL_ARTICLE_ORDER_DESC="The order that articles will show in." @@ -310,13 +310,13 @@ JGLOBAL_DATE_FORMAT_DESC="Optional format string for showing the date. For examp JGLOBAL_DATE_FORMAT_LABEL="Date Format" JGLOBAL_DESCRIPTION="Description" JGLOBAL_DISPLAY_NUM="Display #" -JGLOBAL_DISPLAY_SELECT_DESC="Whether to show or hide the Display Select dropdown listbox." +JGLOBAL_DISPLAY_SELECT_DESC="Show or hide the Display Select dropdown listbox." JGLOBAL_DISPLAY_SELECT_LABEL="Display Select" JGLOBAL_DOWN="Down" JGLOBAL_EDIT_ITEM="Edit item" JGLOBAL_EDIT_PREFERENCES="Edit Preferences" JGLOBAL_EMAIL="Email" -JGLOBAL_EMPTY_CATEGORIES_DESC="Whether to show or hide categories that contain no articles and no subcategories." +JGLOBAL_EMPTY_CATEGORIES_DESC="Show or hide categories that contain no articles and no subcategories." JGLOBAL_EMPTY_CATEGORIES_LABEL="Empty Categories" JGLOBAL_ERROR_INSUFFICIENT_BATCH_INFORMATION="Insufficient information to perform the batch operation" JGLOBAL_FEED_SHOW_READMORE_DESC="Displays a "Read More" link in the news feeds if Intro Text is set to Show." @@ -367,7 +367,7 @@ JGLOBAL_FIELDSET_BASIC="Options" JGLOBAL_FILTER_ATTRIBUTES_DESC="3. List additional attributes, separating each attribute name with a space or comma. For example: class,title,id." JGLOBAL_FILTER_ATTRIBUTES_LABEL="Filter Attributes3" JGLOBAL_FILTER_CLIENT="- Select Location -" -JGLOBAL_FILTER_FIELD_DESC="Whether to show a Filter field for the list. Select Hide to hide the filter field." +JGLOBAL_FILTER_FIELD_DESC="Show or hide a filter field for the list." JGLOBAL_FILTER_FIELD_LABEL="Filter Field" JGLOBAL_FILTER_GROUPS_DESC="This sets the user groups that you want filters applied to. Other groups will have no filtering performed." JGLOBAL_FILTER_GROUPS_LABEL="Filter Groups" @@ -404,9 +404,9 @@ JGLOBAL_LINKED_TITLES_LABEL="Linked Titles" JGLOBAL_LIST="List" JGLOBAL_LIST_ALIAS="(Alias: %s)" JGLOBAL_LIST_ALIAS_NOTE="(Alias: %s, Note: %s)" -JGLOBAL_LIST_AUTHOR_DESC="Whether to show article author in the list of articles." +JGLOBAL_LIST_AUTHOR_DESC="Show or hide the article author in the list of articles." JGLOBAL_LIST_AUTHOR_LABEL="Show Author in List" -JGLOBAL_LIST_HITS_DESC="Whether to show article hits in the list of articles." +JGLOBAL_LIST_HITS_DESC="Show or hide article hits in the list of articles." JGLOBAL_LIST_HITS_LABEL="Show Hits in List" JGLOBAL_LIST_LAYOUT_OPTIONS="List Layouts" JGLOBAL_LIST_NOTE="(Note: %s)" @@ -469,7 +469,7 @@ JGLOBAL_REMEMBER_ME="Remember Me" JGLOBAL_RIGHT="Right" JGLOBAL_ROOT="Root" JGLOBAL_ROOT_PARENT="- No parent -" -JGLOBAL_SAVE_HISTORY_OPTIONS_DESC="Whether to automatically save old versions of an item. If set to Yes, old versions of items are saved automatically. When editing, you may restore from a previous version of the item." +JGLOBAL_SAVE_HISTORY_OPTIONS_DESC="Automatically save old versions of an item. If set to Yes, old versions of items are saved automatically. When editing, you may restore from a previous version of the item." JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL="Enable Versions" JGLOBAL_SECRETKEY="Secret Key" JGLOBAL_SECRETKEY_HELP="If you have enabled two factor authentication in your user account please enter your secret key. If you do not know what this means, you can leave this field blank." @@ -495,9 +495,9 @@ JGLOBAL_SHOW_CATEGORY_TITLE="Category Title" JGLOBAL_SHOW_CATEGORY_TITLE_DESC="If Show, the Category Title will show as a subheading on the page. The subheading is usually displayed inside the "H2" tag." JGLOBAL_SHOW_CREATE_DATE_DESC="If set to Show, the date and time an Article was created will be displayed. This a global setting but can be changed at Menu and Article levels." JGLOBAL_SHOW_CREATE_DATE_LABEL="Show Create Date" -JGLOBAL_SHOW_DATE_DESC="Whether to show a date column in the list of articles. Select Hide to hide the date, or select which date you wish to show." +JGLOBAL_SHOW_DATE_DESC="Show or hide a date column in the list of articles, or select which date you wish to show." JGLOBAL_SHOW_DATE_LABEL="Show Date" -JGLOBAL_SHOW_EMAIL_ICON_DESC="Show or hide the email icon. This allows you to email an article." +JGLOBAL_SHOW_EMAIL_ICON_DESC="Show or hide the email link. This allows you to email an article." JGLOBAL_SHOW_EMAIL_ICON_LABEL="Show Email" JGLOBAL_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty - if it has no items or subcategories." JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL="Empty Categories" @@ -520,7 +520,7 @@ JGLOBAL_SHOW_NAVIGATION_DESC="If set to Show, shows a navigation link (Next, Pre JGLOBAL_SHOW_NAVIGATION_LABEL="Show Navigation" JGLOBAL_SHOW_PARENT_CATEGORY_DESC="If set to Show, the title of the article’s parent category will show." JGLOBAL_SHOW_PARENT_CATEGORY_LABEL="Show Parent" -JGLOBAL_SHOW_PRINT_ICON_DESC="Show or hide the Item Print link." +JGLOBAL_SHOW_PRINT_ICON_DESC="Show or hide the print. This allows you to print an article." JGLOBAL_SHOW_PRINT_ICON_LABEL="Show Print" JGLOBAL_SHOW_PUBLISH_DATE_DESC="If set to Show, the date and time an Article was published will be displayed. This is a global setting but can be changed at the Category, Menu and Article levels." JGLOBAL_SHOW_PUBLISH_DATE_LABEL="Show Publish Date" diff --git a/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini b/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini index 0cafce1ad890e..e2ac4d842d970 100644 --- a/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini +++ b/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini @@ -19,7 +19,7 @@ PLG_CONTENT_PAGEBREAK_SITE_ARTICLEINDEX_LABEL="Article Index Heading" PLG_CONTENT_PAGEBREAK_SITE_TITLE_DESC="Title and heading attributes from Plugin added to Site Title tag." PLG_CONTENT_PAGEBREAK_SITE_TITLE_LABEL="Show Site Title" PLG_CONTENT_PAGEBREAK_SLIDERS="Sliders" -PLG_CONTENT_PAGEBREAK_STYLE_DESC="Choose whether to layout the article with separate pages, tabs or sliders." +PLG_CONTENT_PAGEBREAK_STYLE_DESC="Display the article with separate pages, tabs or sliders." PLG_CONTENT_PAGEBREAK_STYLE_LABEL="Presentation Style" PLG_CONTENT_PAGEBREAK_TABS="Tabs" PLG_CONTENT_PAGEBREAK_TOC_DESC="Display a table of contents on multipage Articles." diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini index c739b6c188cfc..71ab2a85d282d 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini @@ -86,7 +86,7 @@ PLG_TINY_FIELD_RESIZE_HORIZONTAL_DESC="Enable/disable the horizontal resizing." PLG_TINY_FIELD_RESIZE_HORIZONTAL_LABEL="Horizontal Resizing" PLG_TINY_FIELD_RESIZING_DESC="Enable/disable the resizing of the editor area (vertically and also horizontally if 'Horizontal Resizing' is enabled)." PLG_TINY_FIELD_RESIZING_LABEL="Resizing" -PLG_TINY_FIELD_RTL_DESC="Select whether to display the RTL button." +PLG_TINY_FIELD_RTL_DESC="Show or hide the RTL button." PLG_TINY_FIELD_RTL_LABEL="Directionality" PLG_TINY_FIELD_SAVEWARNING_DESC="Save Warning: gives warning if you cancel without saving changes." PLG_TINY_FIELD_SAVEWARNING_LABEL="Save Warning" diff --git a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini index a87e44031ab82..97e91f7d91f53 100644 --- a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini +++ b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini @@ -5,7 +5,7 @@ PLG_INSTALLER_WEBINSTALLER="Installer - Install from Web" PLG_INSTALLER_WEBINSTALLER_LOAD_APPS="Display the extensions" -PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_DESC="Indicate whether to place the Install from Web tab first or last." +PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_DESC="Place the Install from Web tab first or last." PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_LABEL="Tab Position" PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_FIRST="First" PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_LAST="Last" diff --git a/administrator/language/en-GB/en-GB.plg_system_debug.ini b/administrator/language/en-GB/en-GB.plg_system_debug.ini index 1b1fcd3359fe6..72d2d304239df 100644 --- a/administrator/language/en-GB/en-GB.plg_system_debug.ini +++ b/administrator/language/en-GB/en-GB.plg_system_debug.ini @@ -24,7 +24,7 @@ PLG_DEBUG_FIELD_LOGS_DESC="Display a list of logged messages." PLG_DEBUG_FIELD_LOGS_LABEL="Show Log Entries" PLG_DEBUG_FIELD_LOG_CATEGORIES_DESC="A comma separated list of log categories to include. Common log categories include but are not limited to: database, databasequery, database-error, deprecated and jerror. If empty, all categories will be shown." PLG_DEBUG_FIELD_LOG_CATEGORIES_LABEL="Log Categories" -PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_DESC="Select whether the listed categories should be included or excluded." +PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_DESC="Select if the listed categories should be included or excluded." PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_EXCLUDE="Exclude" PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_INCLUDE="Include" PLG_DEBUG_FIELD_LOG_CATEGORY_MODE_LABEL="Log Category Mode" diff --git a/administrator/manifests/libraries/fof.xml b/administrator/manifests/libraries/fof.xml index 80dc1d82aa9e7..1b91bb7f6018e 100644 --- a/administrator/manifests/libraries/fof.xml +++ b/administrator/manifests/libraries/fof.xml @@ -1,6 +1,6 @@ - FOF + FOF fof LIB_FOF_XML_DESCRIPTION 2015-04-22 13:15:32 diff --git a/administrator/manifests/libraries/idna_convert.xml b/administrator/manifests/libraries/idna_convert.xml index 8c5d29d5cb73c..4b1d9909e916f 100644 --- a/administrator/manifests/libraries/idna_convert.xml +++ b/administrator/manifests/libraries/idna_convert.xml @@ -1,6 +1,6 @@ - IDNA Convert + LIB_IDNA idna_convert 0.8.0 LIB_IDNA_XML_DESCRIPTION diff --git a/administrator/manifests/libraries/joomla.xml b/administrator/manifests/libraries/joomla.xml index d6711dee765c0..a104b07487cbc 100644 --- a/administrator/manifests/libraries/joomla.xml +++ b/administrator/manifests/libraries/joomla.xml @@ -1,6 +1,6 @@ - Joomla! Platform + LIB_JOOMLA joomla 13.1 LIB_JOOMLA_XML_DESCRIPTION diff --git a/administrator/manifests/libraries/phpass.xml b/administrator/manifests/libraries/phpass.xml index b4551de6d77a9..55bb9d50383bf 100644 --- a/administrator/manifests/libraries/phpass.xml +++ b/administrator/manifests/libraries/phpass.xml @@ -1,6 +1,6 @@ - PHPass + LIB_PHPASS phpass LIB_PHPASS_XML_DESCRIPTION 2004-2006 diff --git a/administrator/manifests/libraries/phputf8.xml b/administrator/manifests/libraries/phputf8.xml index 2f10b0b6eb622..cbf41bb387b1b 100644 --- a/administrator/manifests/libraries/phputf8.xml +++ b/administrator/manifests/libraries/phputf8.xml @@ -1,6 +1,6 @@ - phputf8 + LIB_PHPUTF8 phputf8 0.5 LIB_PHPUTF8_XML_DESCRIPTION diff --git a/administrator/templates/isis/js/template.js b/administrator/templates/isis/js/template.js index 38f5aed4dc67d..1cc34f8adebd6 100644 --- a/administrator/templates/isis/js/template.js +++ b/administrator/templates/isis/js/template.js @@ -69,108 +69,115 @@ /** * Append submenu items to empty UL on hover allowing a scrollable dropdown */ - var menuScroll = $('#menu > li > ul'), - emptyMenu = $('#nav-empty'); - - $('#menu > li').on('click mouseenter', function() { - - // Set max-height (and width if scroll) for dropdown menu, depending of window height - var $dropdownMenu = $(this).children('ul'), - windowHeight = $w.height(), - linkHeight = $(this).outerHeight(true), - statusHeight = $('#status').outerHeight(true), - menuHeight = $dropdownMenu.height(), - menuOuterHeight = $dropdownMenu.outerHeight(true), - scrollMenuWidth = $dropdownMenu.width() + 15, - maxHeight = windowHeight - (linkHeight + statusHeight + (menuOuterHeight - menuHeight) + 20); - - if (maxHeight < menuHeight) { - $dropdownMenu.css('width', scrollMenuWidth); - } else if (maxHeight > menuHeight) { - $dropdownMenu.css('width', 'auto'); - } + if ($w.width() > 767) { + + var menuScroll = $('#menu > li > ul'), + emptyMenu = $('#nav-empty'); + + $('#menu > li').on('click mouseenter', function() { + + // Set max-height (and width if scroll) for dropdown menu, depending of window height + var $dropdownMenu = $(this).children('ul'), + windowHeight = $w.height(), + linkHeight = $(this).outerHeight(true), + statusHeight = $('#status').outerHeight(true), + menuHeight = $dropdownMenu.height(), + menuOuterHeight = $dropdownMenu.outerHeight(true), + scrollMenuWidth = $dropdownMenu.width() + 15, + maxHeight = windowHeight - (linkHeight + statusHeight + (menuOuterHeight - menuHeight) + 20); + + if (maxHeight < menuHeight) { + $dropdownMenu.css('width', scrollMenuWidth); + } else if (maxHeight > menuHeight) { + $dropdownMenu.css('width', 'auto'); + } - $dropdownMenu.css('max-height', maxHeight); + $dropdownMenu.css('max-height', maxHeight); - // Get the submenu position - linkWidth = $(this).outerWidth(true); - menuWidth = $dropdownMenu.width(); - linkPaddingLeft = $(this).children('a').css('padding-left'); - offsetLeft = Math.round($(this).offset().left) - parseInt(linkPaddingLeft); + // Get the submenu position + linkWidth = $(this).outerWidth(true); + menuWidth = $dropdownMenu.width(); + linkPaddingLeft = $(this).children('a').css('padding-left'); + offsetLeft = Math.round($(this).offset().left) - parseInt(linkPaddingLeft); - emptyMenu.empty().hide(); + emptyMenu.empty().hide(); - }); + }); - menuScroll.find('.dropdown-submenu > a').on('mouseover', function() { + menuScroll.find('.dropdown-submenu > a').on('mouseover', function() { - var $self = $(this), - dropdown = $self.next('ul'), - submenuWidth = dropdown.outerWidth(), - offsetTop = $self.offset().top, - linkPaddingTop = parseInt(dropdown.css('padding-top')) + parseInt($(this).css('padding-top')), - scroll = $w.scrollTop() + linkPaddingTop; + var $self = $(this), + dropdown = $self.next('ul'), + submenuWidth = dropdown.outerWidth(), + offsetTop = $self.offset().top, + linkPaddingTop = parseInt(dropdown.css('padding-top')) + parseInt($(this).css('padding-top')), + scroll = $w.scrollTop() + linkPaddingTop; - // Set the submenu position - if ($('html').attr('dir') == 'rtl') - { - emptyMenu.css({ - top : offsetTop - scroll, - left: offsetLeft - (menuWidth - linkWidth) - submenuWidth - }); - } - else - { - emptyMenu.css({ - top : offsetTop - scroll, - left: offsetLeft + menuWidth - }); - } + // Set the submenu position + if ($('html').attr('dir') == 'rtl') + { + emptyMenu.css({ + top : offsetTop - scroll, + left: offsetLeft - (menuWidth - linkWidth) - submenuWidth + }); + } + else + { + emptyMenu.css({ + top : offsetTop - scroll, + left: offsetLeft + menuWidth + }); + } - // Append items to empty
    and show it - dropdown.hide(); - emptyMenu.show().html(dropdown.html()); + // Append items to empty
      and show it + dropdown.hide(); + emptyMenu.show().html(dropdown.html()); - // Check if the full element is visible. If not, adjust the position - if (emptyMenu.Jvisible() !== true) - { - emptyMenu.css({ - top : ($w.height() - emptyMenu.outerHeight()) - $('#status').height() - }); - } + // Check if the full element is visible. If not, adjust the position + if (emptyMenu.Jvisible() !== true) + { + emptyMenu.css({ + top : ($w.height() - emptyMenu.outerHeight()) - $('#status').height() + }); + } - }); - menuScroll.find('a.no-dropdown').on('mouseenter', function() { + }); - emptyMenu.empty().hide(); + menuScroll.find('a.no-dropdown').on('mouseenter', function() { - }); - $(document).on('click', function() { + emptyMenu.empty().hide(); - emptyMenu.empty().hide(); + }); - }); + $(document).on('click', function() { - $.fn.Jvisible = function(partial,hidden) - { - if (this.length < 1) + emptyMenu.empty().hide(); + + }); + + $.fn.Jvisible = function(partial,hidden) { - return; - } + if (this.length < 1) + { + return; + } + + var $t = this.length > 1 ? this.eq(0) : this, + t = $t.get(0) - var $t = this.length > 1 ? this.eq(0) : this, - t = $t.get(0) + var viewTop = $w.scrollTop(), + viewBottom = (viewTop + $w.height()) - $('#status').height(), + offset = $t.offset(), + _top = offset.top, + _bottom = _top + $t.height(), + compareTop = partial === true ? _bottom : _top, + compareBottom = partial === true ? _top : _bottom; - var viewTop = $w.scrollTop(), - viewBottom = (viewTop + $w.height()) - $('#status').height(), - offset = $t.offset(), - _top = offset.top, - _bottom = _top + $t.height(), - compareTop = partial === true ? _bottom : _top, - compareBottom = partial === true ? _top : _bottom; + return !!t.offsetWidth * t.offsetHeight && ((compareBottom <= viewBottom) && (compareTop >= viewTop)); + }; + + } - return !!t.offsetWidth * t.offsetHeight && ((compareBottom <= viewBottom) && (compareTop >= viewTop)); - }; /** * USED IN: All views with toolbar and sticky bar enabled diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql index 5fbfe52d4586f..21e132698a899 100644 --- a/installation/sql/mysql/joomla.sql +++ b/installation/sql/mysql/joomla.sql @@ -290,7 +290,7 @@ CREATE TABLE IF NOT EXISTS `#__contact_details` ( `metakey` text NOT NULL, `metadesc` text NOT NULL, `metadata` text NOT NULL, - `featured` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT 'Set if article is featured.', + `featured` tinyint(3) unsigned NOT NULL DEFAULT 0 COMMENT 'Set if contact is featured.', `xreference` varchar(50) NOT NULL COMMENT 'A reference to enable linkages to external data sets.', `publish_up` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `publish_down` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -1433,7 +1433,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, diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index dedb94e4db460..fa82227222123 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -299,7 +299,7 @@ CREATE INDEX "#__contact_details_idx_featured_catid" ON "#__contact_details" ("f CREATE INDEX "#__contact_details_idx_language" ON "#__contact_details" ("language"); CREATE INDEX "#__contact_details_idx_xreference" ON "#__contact_details" ("xreference"); -COMMENT ON COLUMN "#__contact_details"."featured" IS 'Set if article is featured.'; +COMMENT ON COLUMN "#__contact_details"."featured" IS 'Set if contact is featured.'; COMMENT ON COLUMN "#__contact_details"."xreference" IS 'A reference to enable linkages to external data sets.'; -- @@ -1372,7 +1372,7 @@ CREATE TABLE "#__newsfeeds" ( "id" serial NOT NULL, "name" varchar(100) DEFAULT '' NOT NULL, "alias" varchar(100) DEFAULT '' NOT NULL, - "link" varchar(200) DEFAULT '' NOT NULL, + "link" varchar(2048) DEFAULT '' NOT NULL, "published" smallint DEFAULT 0 NOT NULL, "numarticles" bigint DEFAULT 1 NOT NULL, "cache_time" bigint DEFAULT 3600 NOT NULL, diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql index 567ee8b313462..685c0c84c8e4e 100644 --- a/installation/sql/sqlazure/joomla.sql +++ b/installation/sql/sqlazure/joomla.sql @@ -2229,7 +2229,7 @@ CREATE TABLE [#__newsfeeds]( [id] [bigint] IDENTITY(1,1) NOT NULL, [name] [nvarchar](100) NOT NULL DEFAULT '', [alias] [nvarchar](255) NOT NULL, - [link] [nvarchar](200) NOT NULL DEFAULT '', + [link] [nvarchar](2048) NOT NULL DEFAULT '', [published] [smallint] NOT NULL DEFAULT 0, [numarticles] [bigint] NOT NULL DEFAULT 1, [cache_time] [bigint] NOT NULL DEFAULT 3600, diff --git a/language/en-GB/en-GB.com_config.ini b/language/en-GB/en-GB.com_config.ini index a4ca606796d74..d89ed7bca77d6 100644 --- a/language/en-GB/en-GB.com_config.ini +++ b/language/en-GB/en-GB.com_config.ini @@ -14,13 +14,13 @@ COM_CONFIG_FIELD_METADESC_DESC="Enter a description of the overall website that COM_CONFIG_FIELD_METADESC_LABEL="Site Meta Description" COM_CONFIG_FIELD_METAKEYS_DESC="Enter the keywords and phrases that best describe your website. Separate keywords and phrases with a comma." COM_CONFIG_FIELD_METAKEYS_LABEL="Site Meta Keywords" -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_SITE_NAME_DESC="Enter the name of your website. This will be used in various locations (eg the Backend browser title bar and Site Offline pages)." COM_CONFIG_FIELD_SITE_NAME_LABEL="Site Name" COM_CONFIG_FIELD_VALUE_AFTER="After" COM_CONFIG_FIELD_VALUE_BEFORE="Before" -COM_CONFIG_FIELD_SITE_OFFLINE_DESC="Select whether access to the Site Frontend is available. If Yes, the Frontend will display a message if set such in Backend." +COM_CONFIG_FIELD_SITE_OFFLINE_DESC="Select if access to the Site Frontend is available. If Yes, the Frontend will display a message if set such in Backend." 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" diff --git a/language/en-GB/en-GB.lib_idna_convert.sys.ini b/language/en-GB/en-GB.lib_idna_convert.sys.ini index 18a9dc63ac233..cd02e8ba591be 100644 --- a/language/en-GB/en-GB.lib_idna_convert.sys.ini +++ b/language/en-GB/en-GB.lib_idna_convert.sys.ini @@ -3,5 +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 +LIB_IDNA="IDNA Convert" LIB_IDNA_XML_DESCRIPTION="The class idna_convert allows to convert internationalised domain names (see RFC 3490, 3491, 3492 and 3454 for details) as they can be used with various registries worldwide to be translated between their original (localised) form and their encoded form as it will be used in the DNS (Domain Name System)." diff --git a/language/en-GB/en-GB.lib_joomla.sys.ini b/language/en-GB/en-GB.lib_joomla.sys.ini index 63bf3fe67b3f8..07feae72f54ec 100644 --- a/language/en-GB/en-GB.lib_joomla.sys.ini +++ b/language/en-GB/en-GB.lib_joomla.sys.ini @@ -3,5 +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 +LIB_JOOMLA="Joomla! Platform" LIB_JOOMLA_XML_DESCRIPTION="The Joomla! Platform is the Core of the Joomla! Content Management System." diff --git a/language/en-GB/en-GB.lib_phpass.sys.ini b/language/en-GB/en-GB.lib_phpass.sys.ini index 0a71e680b2e8b..55d5af7a7f27c 100644 --- a/language/en-GB/en-GB.lib_phpass.sys.ini +++ b/language/en-GB/en-GB.lib_phpass.sys.ini @@ -3,4 +3,5 @@ ; 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 +LIB_PHPASS="phpass" LIB_PHPASS_XML_DESCRIPTION="phpass is a portable password hashing framework for use in PHP applications. The preferred (most secure) hashing method supported by phpass is the OpenBSD-style bcrypt (known in PHP as CRYPT_BLOWFISH), with a fallback to BSDI-style extended DES-based hashes (known in PHP as CRYPT_EXT_DES) and a last resort fallback to an MD5-based variable iteration count password hashing method implemented in phpass itself." diff --git a/language/en-GB/en-GB.lib_phputf8.sys.ini b/language/en-GB/en-GB.lib_phputf8.sys.ini index 731abfd2b36de..58e4f5031311f 100644 --- a/language/en-GB/en-GB.lib_phputf8.sys.ini +++ b/language/en-GB/en-GB.lib_phputf8.sys.ini @@ -3,5 +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 +LIB_PHPUTF8="phputf8" LIB_PHPUTF8_XML_DESCRIPTION="Classes for UTF-8." diff --git a/language/en-GB/en-GB.mod_articles_category.ini b/language/en-GB/en-GB.mod_articles_category.ini index ecd90f1b6e4d9..45bec56d0e9b4 100644 --- a/language/en-GB/en-GB.mod_articles_category.ini +++ b/language/en-GB/en-GB.mod_articles_category.ini @@ -48,7 +48,7 @@ MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_DESC="Please enter in a numeric chara MOD_ARTICLES_CATEGORY_FIELD_INTROTEXTLIMIT_LABEL="Introtext Limit" MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_LABEL="Linked Titles" MOD_ARTICLES_CATEGORY_FIELD_LINKTITLES_DESC="Linked titles." -MOD_ARTICLES_CATEGORY_FIELD_MODE_DESC="Please select the mode you would like to use. If Normal Mode is chosen, then simply configure the module and it will display a static list of Articles on the menu items you assign the module to. If Dynamic Mode is chosen, then you can still configure the module normally, however now the Category option will no longer be used. Instead, the module will dynamically detect whether or not you are on a Category view and will display the list of articles within that Category accordingly. When Dynamic Mode is chosen, it is best to leave the module set to display on all pages, as it will decide whether or not to display anything dynamically." +MOD_ARTICLES_CATEGORY_FIELD_MODE_DESC="Please select the mode you would like to use. If Normal Mode is chosen, then simply configure the module and it will display a static list of Articles on the menu items you assign the module to. If Dynamic Mode is chosen, then you can still configure the module normally, however now the Category option will no longer be used. Instead, the module will dynamically detect if you are on a Category view and will display the list of articles within that Category accordingly. When Dynamic Mode is chosen, it is best to leave the module set to display on all pages, as it will decide to display anything dynamically." MOD_ARTICLES_CATEGORY_FIELD_MODE_LABEL="Mode" MOD_ARTICLES_CATEGORY_FIELD_MONTHYEARFORMAT_DESC="Please enter in a valid date format. See: http://php.net/date for formatting information." MOD_ARTICLES_CATEGORY_FIELD_MONTHYEARFORMAT_LABEL="Month and Year Display Format" diff --git a/language/en-GB/en-GB.mod_finder.ini b/language/en-GB/en-GB.mod_finder.ini index 990d7c0030787..fbcab5eeb4210 100644 --- a/language/en-GB/en-GB.mod_finder.ini +++ b/language/en-GB/en-GB.mod_finder.ini @@ -23,15 +23,15 @@ MOD_FINDER_FIELDSET_ADVANCED_LABEL_POS_DESCRIPTION="The position of the search l MOD_FINDER_FIELDSET_ADVANCED_LABEL_POS_LABEL="Label Position" MOD_FINDER_FIELDSET_ADVANCED_SETITEMID_DESCRIPTION="Assign an ItemID by selecting a menu item in the list for the display of the search results if there is no com_finder menu item and a specific display is desired. If you do not know what this means, you may not need it." MOD_FINDER_FIELDSET_ADVANCED_SETITEMID_LABEL="Set ItemID" -MOD_FINDER_FIELDSET_ADVANCED_SHOW_BUTTON_DESCRIPTION="Toggle whether a button should be displayed for the search form." +MOD_FINDER_FIELDSET_ADVANCED_SHOW_BUTTON_DESCRIPTION="Show or hide a button for the search form." MOD_FINDER_FIELDSET_ADVANCED_SHOW_BUTTON_LABEL="Search Button" -MOD_FINDER_FIELDSET_ADVANCED_SHOW_LABEL_DESCRIPTION="Toggle whether a label should be displayed for the search field." +MOD_FINDER_FIELDSET_ADVANCED_SHOW_LABEL_DESCRIPTION="Show or hide a label for the search field." MOD_FINDER_FIELDSET_ADVANCED_SHOW_LABEL_LABEL="Search Field Label" -MOD_FINDER_FIELDSET_BASIC_AUTOSUGGEST_DESCRIPTION="Toggle whether automatic search suggestions should be displayed." +MOD_FINDER_FIELDSET_BASIC_AUTOSUGGEST_DESCRIPTION="Show or hide automatic search suggestions." MOD_FINDER_FIELDSET_BASIC_AUTOSUGGEST_LABEL="Search Suggestions" MOD_FINDER_FIELDSET_BASIC_SEARCHFILTER_DESCRIPTION="Selecting a Search Filter will limit any searches submitted through this module to use the selected filter." MOD_FINDER_FIELDSET_BASIC_SEARCHFILTER_LABEL="Search Filter" -MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_DESCRIPTION="Toggle whether users should be able to see advanced search options. If set to Link to Component option creates a Smart Search link which redirects to the smart search view. If set to show, the advanced search options will be displayed inline." +MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_DESCRIPTION="Show or hide advanced search options. If set to Link to Component option creates a Smart Search link which redirects to the smart search view. If set to show, the advanced search options will be displayed inline." MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_LABEL="Advanced Search" MOD_FINDER_FIELDSET_BASIC_SHOW_ADVANCED_OPTION_LINK="Link to Component" MOD_FINDER_FIELD_OPENSEARCH_DESCRIPTION="Some browsers can add support for your site's search if this option is enabled." diff --git a/language/en-GB/en-GB.mod_languages.ini b/language/en-GB/en-GB.mod_languages.ini index 81b043ad332ca..78d00c936c3ea 100644 --- a/language/en-GB/en-GB.mod_languages.ini +++ b/language/en-GB/en-GB.mod_languages.ini @@ -6,7 +6,7 @@ MOD_LANGUAGES="Language Switcher" MOD_LANGUAGES_FIELD_ACTIVE_DESC="Display or not the active language. If displayed, the class 'lang-active' will be added to the element." MOD_LANGUAGES_FIELD_ACTIVE_LABEL="Active Language" -MOD_LANGUAGES_FIELD_CACHING_DESC="Select whether to cache or not the content of this module.
      This should be set to 'No caching' when using Items Associations." +MOD_LANGUAGES_FIELD_CACHING_DESC="Use the global cache setting the content of this module or disable caching for this module.
      This should be set to 'No caching' when using Items Associations." MOD_LANGUAGES_FIELD_DROPDOWN_DESC="If set to 'Yes', the content languages native names will display in a dropdown." MOD_LANGUAGES_FIELD_DROPDOWN_LABEL="Use Dropdown" MOD_LANGUAGES_FIELD_DROPDOWN_IMAGE_DESC="Add image flags to the dropdown." diff --git a/tests/README.md b/tests/README.md index c06eaf71e1818..abc6d86dfa15c 100644 --- a/tests/README.md +++ b/tests/README.md @@ -4,5 +4,6 @@ Testing Joomla CMS The current folder contains the Tests for Quality Assurance of the Joomla Content Management System. * unit: contains the Joomla-cms unit tests based on PHPUnit +* javascript: contains the Joomla! javascript tests based on Jasmine and Karma Find more details inside each folder.